From dfc2c78531b7ea0e27aff23a0f1d10a6b4bad49d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 06 十一月 2023 15:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index d56149e..b959c4d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -24,12 +24,17 @@
     @PostMapping(value = "/deduction/customer/confirm/all")
     Result customerConfirmAll(@RequestBody DeductionDto dto);
 
-
     /**
      * 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁
      */
     @PostMapping(value = "/deduction/customer/confirm/before")
     Result customerConfirmBefore(@RequestBody DeductionDto dto);
+
+    /**
+     * 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁鎵�鏈夋湭纭鏁版嵁
+     */
+    @PostMapping(value = "/deduction/customer/confirm/all/before")
+    Result customerConfirmAllBefore(@RequestBody DeductionDto dto);
 
     /**
      * 鑾峰彇鐢ㄦ埛鍒掓墸淇℃伅涔嬪墠鐨勫尰鐢熶俊鎭�
@@ -60,4 +65,10 @@
      */
     @PostMapping(value = "/deduction/delete")
     Result deleteData(@RequestBody DeductionDto dto);
+
+    /**
+     * 鍒掓墸鏈悗鎻愮ず鍗¢�氱煡鑾峰彇鏁版嵁
+     */
+    @PostMapping(value = "/deduction/postoperative/card/info")
+    Result postoperativeCardInfo(@RequestBody DeductionDto dto);
 }
\ No newline at end of file

--
Gitblit v1.8.0