修复窗口取消结算的问题

src/main/java/thyyxxk/webserver/controller/medicalinsurance/MarkMtFeesController.java

@@ -72,18 +72,19 @@ public class MarkMtFeesController {
         mz.setPatNo(param.getPatientId());
         mz.setTimes(param.getTimes());
         mz.setStaffId(param.getStaffId());
-        ResultVo<String> result = mzService.revokeOutpatientSettlement(mz);
-        Map<String, Object> map = new HashMap<>();
-        if (result.getCode() == ExceptionEnum.SUCCESS.getCode()) {
-            map.put("code", 0);
-            map.put("msg", result.getData());
-            mzService.updateMzSaved(param.getPatientId(), param.getTimes(), 0);
-        } else {
-            map.put("code", -1);
-            map.put("msg", result.getMessage());
-        }
-        log.info("窗口取消门特结算：参数：{}，结果：{}", param, map);
-        return map;
+        ResultVo<FundDetail> result = mzService.revokeOutpatientSettlement(mz);
+        return getStringObjectMap(param, result, "收费窗口撤销门特结算", true);
+//        Map<String, Object> map = new HashMap<>();
+//        if (result.getCode() == ExceptionEnum.SUCCESS.getCode()) {
+//            map.put("code", 0);
+//            map.put("msg", result.getData());
+//            mzService.updateMzSaved(param.getPatientId(), param.getTimes(), 0);
+//        } else {
+//            map.put("code", -1);
+//            map.put("msg", result.getMessage());
+//        }
+//        log.info("窗口取消门特结算：参数：{}，结果：{}", param, map);
+//        return map;
     }
 
     private Map<String, Object> getStringObjectMap(@RequestBody UploadMtFeeParam param,

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiMzController.java

@@ -95,7 +95,7 @@ public class SiMzController {
     }
 
     @PostMapping("/revokeOutpatientSettlement")
-    public ResultVo<String> revokeOutpatientSettlement(@RequestBody MzPatientInfo p) {
+    public ResultVo<FundDetail> revokeOutpatientSettlement(@RequestBody MzPatientInfo p) {
         return service.revokeOutpatientSettlement(p);
     }
 

src/main/java/thyyxxk/webserver/service/externalhttp/SiMzSrvc.java

@@ -32,5 +32,5 @@ public interface SiMzSrvc {
     ResultVo<FundDetail> outpatientSettlement(@JSONBody MzPatientInfo p);
 
     @Post("/revokeOutpatientSettlement")
-    ResultVo<String> revokeOutpatientSettlement(@JSONBody MzPatientInfo p);
+    ResultVo<FundDetail> revokeOutpatientSettlement(@JSONBody MzPatientInfo p);
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiMzService.java

@@ -267,7 +267,7 @@ public class SiMzService {
         return mzSrvc.outpatientSettlement(p);
     }
 
-    public ResultVo<String> revokeOutpatientSettlement(MzPatientInfo p) {
+    public ResultVo<FundDetail> revokeOutpatientSettlement(MzPatientInfo p) {
         if (null == p.getStaffId()) {
             p.setStaffId(TokenUtil.getTokenUserId());
         }