费用清单功能不变

src/main/java/cn/hnthyy/thmz/controller/MzChargeDetailController.java

@@ -750,28 +750,23 @@ public class MzChargeDetailController {
                 resultMap.put("message", "检索结束时间不能为空");
                 return resultMap;
             }
-            if (StringUtils.isBlank(chargeFeeParamsVo.getSerialNo())) {
-                chargeFeeParamsVo.setSerialNo(null);
+            if (StringUtils.isBlank(chargeFeeParamsVo.getPatientId())) {
+                chargeFeeParamsVo.setPatientId(null);
             } else {
-                chargeFeeParamsVo.setSerialNo("%" + chargeFeeParamsVo.getSerialNo() + "%");
+                chargeFeeParamsVo.setPatientId("%" + chargeFeeParamsVo.getPatientId() + "%");
             }
-            List<String> patientIds=null;
             if (StringUtils.isBlank(chargeFeeParamsVo.getName())) {
                 chargeFeeParamsVo.setName(null);
             } else {
-                List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByName(chargeFeeParamsVo.getName());
-                if(mzPatientMis!=null){
-                    patientIds=  mzPatientMis.stream().map(m-> m.getPatientId()).collect(Collectors.toList());
-                }
+                chargeFeeParamsVo.setName("%" + chargeFeeParamsVo.getName() + "%");
             }
-            if (StringUtils.isNotBlank(chargeFeeParamsVo.getPatientId())) {
-                if(patientIds==null){
-                    patientIds = new ArrayList<>();
-                }
-                patientIds.add(chargeFeeParamsVo.getPatientId());
+            if (StringUtils.isBlank(chargeFeeParamsVo.getSerialNo())) {
+                chargeFeeParamsVo.setSerialNo(null);
+            } else {
+                chargeFeeParamsVo.setSerialNo("%" + chargeFeeParamsVo.getSerialNo() + "%");
             }
             resultMap.put("code", 0);
-            resultMap.put("mzChargeDetailList", mzReceiptSerialService.queryChargeListByPatient(patientIds,chargeFeeParamsVo.getSerialNo(),chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(),YesNoEnum.YES.equals(chargeFeeParamsVo.getHisData())?"mz_receipt_serial_b":"mz_receipt_serial" ));
+            resultMap.put("mzChargeDetailList", mzChargeDetailService.queryChargeListByPatient(chargeFeeParamsVo.getHisData(), chargeFeeParamsVo.getPatientId(), chargeFeeParamsVo.getName(), chargeFeeParamsVo.getSerialNo(), chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
             resultMap.put("message", "查询病人缴费记录成功");
             return resultMap;
         } catch (Exception e) {
@@ -814,9 +809,11 @@ public class MzChargeDetailController {
             totalPriceCount = getBigDecimal(data, totalPriceCount);
             User tokenUser = TokenUtil.getUser(httpServletRequest);
             MzReceiptSerial mzReceiptSerial = mzReceiptSerialService.queryReceiptDetailsByReceiptSn(Integer.valueOf(chargeFeeParamsVo.getSerialNo()));
-            Employee opEmployee = employeeService.queryByUserCode(mzReceiptSerial.getOperatorId());
-            if (opEmployee != null) {
-                mzReceiptSerial.setOperatorId(opEmployee.getEmployeeName());
+            if(mzReceiptSerial!=null){
+                Employee opEmployee = employeeService.queryByUserCode(mzReceiptSerial.getOperatorId());
+                if (opEmployee != null) {
+                    mzReceiptSerial.setOperatorId(opEmployee.getEmployeeName());
+                }
             }
             resultMap.put("code", 0);
             resultMap.put("data", data);
@@ -870,13 +867,13 @@ public class MzChargeDetailController {
                 resultMap.put("message", "病人id不能为空");
                 return resultMap;
             }
-            List<Map<String, Object>> mzChargeDetailList = mzReceiptSerialService.queryChargeListByPatient(Arrays.asList(chargeFeeParamsVo.getPatientId()),null,chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(),YesNoEnum.YES.equals(chargeFeeParamsVo.getHisData())?"mz_receipt_serial_b":"mz_receipt_serial" );
+            List<Map<String, Object>> mzChargeDetailList = mzChargeDetailService.queryChargeListByPatient(chargeFeeParamsVo.getHisData(), "%" + chargeFeeParamsVo.getPatientId() + "%", null, null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
             List<Map<String, Object>> data = new ArrayList<>();
             if (mzChargeDetailList != null) {
                 for (Map<String, Object> map : mzChargeDetailList) {
                     if (map != null) {
-                        Integer serialNo = (Integer) map.get("serial_no");
-                        data.addAll(mzChargeDetailService.queryChargeDetailByPatient(chargeFeeParamsVo.getHisData(), chargeFeeParamsVo.getPatientId(), serialNo.toString()));
+                        Integer realNo = (Integer) map.get("real_no");
+                        data.addAll(mzChargeDetailService.queryChargeDetailByPatient(chargeFeeParamsVo.getHisData(), chargeFeeParamsVo.getPatientId(), realNo.toString()));
                     }
                 }
             }

src/main/resources/static/js/charge_list.js

@@ -145,7 +145,7 @@ function initChargeListByPatient() {
             }
         ],
         onClickRow: function (row) {
-            fitfymx(row.patient_id, row.serial_no);
+            fitfymx(row.patient_id, row.real_no);
         },
         responseHandler: function (res) {
             if (res == '401' || res == 401) {