自动退费

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -822,7 +822,7 @@ public class MedicalViewApiController {
             return results;
         }
         try {
-            String[] arr = haiciCharge.getHisOrdNum().split("-");
+            String[] arr = haiciCharge.getHisOrdNum().split("_");
             MzChargeDetail mzChargeDetail = new MzChargeDetail(arr[0], Integer.valueOf(arr[1]));
             mzChargeDetail.setReceiptNo(Integer.valueOf(arr[2]));
             List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryMzChargeDetailByBillItemCode(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getReceiptNo(), PayMarkEnum.CHARGED.code, "2", Arrays.asList("TC"));
@@ -836,24 +836,24 @@ public class MedicalViewApiController {
                 if (md == null || Constants.TC.equals(md.getBillItemCode())) {
                     continue;
                 }
-                if(ConfirmFlagEnum.CONFIRM.code.equals(md.getConfirmFlag())){
+                if (ConfirmFlagEnum.CONFIRM.code.equals(md.getConfirmFlag())) {
                     results.put("resultCode", -1);
                     results.put("resultMessage", "无法退费，当前处方已经被确认，请您联系该科室进行处理");
                     return results;
                 }
                 if (chargeItemCodes == null) {
-                    chargeItemCodes = md.getBillItemCode();
+                    chargeItemCodes = md.getOrderNo() + "_" + md.getItemNo() + "_" + md.getChargeItemCode();
                 } else {
-                    chargeItemCodes += "," + md.getBillItemCode();
+                    chargeItemCodes += "," + md.getOrderNo() + "_" + md.getItemNo() + "_" + md.getChargeItemCode();
                 }
             }
-            MzDepositFileVo mzDepositFileVo = new  MzDepositFileVo();
+            MzDepositFileVo mzDepositFileVo = new MzDepositFileVo();
             mzDepositFileVo.setPatientId(arr[0]);
             mzDepositFileVo.setTimes(Integer.valueOf(arr[1]));
             mzDepositFileVo.setReceiptNo(Integer.valueOf(arr[2]));
             mzDepositFileVo.setChargeItemCodes(chargeItemCodes);
             User tokenUser = userService.queryUserByUserIdCode(Constants.BRZZJF_CODE);
-            mzChargeDetailService.refundFee(tokenUser.getUserIdCode(),mzDepositFileVo);
+            mzChargeDetailService.refundFee(tokenUser.getUserIdCode(), mzDepositFileVo);
             results.put("resultCode", 0);
             results.put("resultMessage", "退费成功");
             results.put("guideListInfo", "");

src/main/java/cn/hnthyy/thmz/vo/MzDepositFileVo.java

@@ -14,7 +14,7 @@ public class MzDepositFileVo {
     private String patientId;
     //病人就诊次数
     private Integer times;
-    //收费编码拼接字符串
+    //收费编码拼接字符串  md.getOrderNo() + "_" + md.getItemNo() + "_" + md.getChargeItemCode()
     private String chargeItemCodes;
     //所有缴费方式与费用
     private List<MzDepositFile> mzDepositFiles;