Browse Source

优化门诊共济

lighter 2 years ago
parent
commit
e6ff236d9d

+ 1 - 7
src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiMzController.java

@@ -60,23 +60,17 @@ public class SiMzController {
         return service.getHistoryReceiptDetail(depositFile);
     }
 
+    @PassToken
     @PostMapping("/insertSiMzFees")
     public ResultVo<String> insertSiMzFees(@RequestBody List<MzReceipt> receipts) {
         return service.insertSiMzFees(receipts);
     }
 
-    @PassToken
-    @PostMapping("/insertSiMzFeesForThmz")
-    public ResultVo<String> insertSiMzFeesForThmz(@RequestBody List<MzReceipt> receipts) {
-        return service.insertSiMzFeesForThmz(receipts);
-    }
-
     @PostMapping("/deleteMzReceipt")
     public ResultVo<String> deleteMtFees(@RequestBody OrderNo param) {
         return service.deleteMzReceipt(param);
     }
 
-
     @PostMapping("/deleteAllMzReceipts")
     public ResultVo<String> deleteAllMzReceipts(@RequestBody MzPatientInfo p) {
         return service.deleteAllMzReceipts(p);

+ 2 - 20
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiMzService.java

@@ -225,29 +225,11 @@ public class SiMzService {
     }
 
     public ResultVo<String> insertSiMzFees(List<MzReceipt> receipts) {
-        receipts.removeIf(itm -> !itm.getChecked());
-        if (receipts.size() == 0) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "请选择至少一条处方明细!");
-        }
-        receipts.forEach(item -> {
-            if (item.getChecked()) {
-                dao.insertBatchedMtFeeInfo(item);
-            }
-        });
-        return ResultVoUtil.success();
-    }
-
-    public ResultVo<String> insertSiMzFeesForThmz(List<MzReceipt> receipts) {
+        receipts.removeIf(item -> !item.getChecked());
         if (receipts.size() == 0) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "患者没有可以报销的项目!");
         }
-        MzReceipt receipt = receipts.get(0);
-        dao.deleteAllReceipts(receipt.getPatientId(), receipt.getTimes());
-        receipts.forEach(item -> {
-            if (item.getChecked() && Objects.equals(item.getTimes(), receipt.getTimes())) {
-                dao.insertBatchedMtFeeInfo(item);
-            }
-        });
+        receipts.forEach(dao::insertBatchedMtFeeInfo);
         return ResultVoUtil.success();
     }