优化门诊

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

@@ -30,7 +30,7 @@ public class MarkMtFeesController {
     }
 
     /**
-     * HRG查询门诊统筹备案
+     * THMZ查询门诊统筹备案
      * */
     @PassToken
     @GetMapping("/fetchSpcSlwinfo")
@@ -39,22 +39,22 @@ public class MarkMtFeesController {
     }
 
     /**
-     * HRG调用试算
+     * THMZ调用试算
      * */
     @PassToken
-    @PostMapping("/uploadFees")
-    public Map<String, Object> uploadFees(@RequestBody SiMzBusinessParams param) {
-//        MzPatientInfo mz = new MzPatientInfo();
-//        mz.setPatNo(param.getPatientId());
-//        mz.setTimes(param.getTimes());
-//        mz.setStaffId(param.getStaffId());
-//        ResultVo<FundDetail> result = mzService.outpatientPreSettlement(mz);
-//        return getStringObjectMap(param, result, "收费窗口获取门诊统筹报销");
-        return settlement(param);
+    @PostMapping("/preSettle")
+    public Map<String, Object> preSettle(@RequestBody SiMzBusinessParams param) {
+        MzPatientInfo mz = new MzPatientInfo();
+        mz.setPatNo(param.getPatientId());
+        mz.setTimes(param.getTimes());
+        mz.setStaffId(param.getStaffId());
+        mz.setAcctUsedFlag(String.valueOf(param.getAcctUsedFlag()));
+        ResultVo<FundDetail> result = mzService.outpatientPreSettlement(mz);
+        return getStringObjectMap(param, result, "收费窗口门诊统筹试算");
     }
 
     /**
-     * HRG调用结算
+     * THMZ调用结算
      * */
     @PassToken
     @PostMapping("/calculateCost")
@@ -69,7 +69,7 @@ public class MarkMtFeesController {
     }
 
     /**
-     * HRG调用取消结算
+     * THMZ调用取消结算
      * */
     @PassToken
     @PostMapping("/retractFees")

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

@@ -873,7 +873,7 @@ public class SiDownloadService {
                     list.clear();
                 }
             }
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 dnlddao.insertTcmSyndrBatch(list);
             }
             if (StringUtil.notBlank(versionName)) {