瀏覽代碼

收费列表初始不查询

yeguodong 3 月之前
父節點
當前提交
53d04ae056

+ 3 - 4
src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -166,7 +166,6 @@ public class MzChargeDetailController {
             MzChargeDetail mzChargeDetail = mzChargeDetailPageDto.getMzChargeDetail();
             List<MzChargeDetail> mzChargeDetails = new ArrayList<>();
             if (PayMarkEnum.NO_CHARGE.code.equals(mzChargeDetail.getPayMark())) {
-                String name = "";
                 if (StringUtils.isNotBlank(mzChargeDetail.getPatientId())) {
                     // 查询病人信息
                     MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzChargeDetail.getPatientId());
@@ -175,11 +174,11 @@ public class MzChargeDetailController {
                         resultMap.put("message", "病人不存在!");
                         return resultMap;
                     }
-                    name = mzPatientMi.getName();
+                    // 将未缴费的处方转成完整的收费明细
+                    mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId(), mzPatientMi.getName()));
 
                 }
-                // 将未缴费的处方转成完整的收费明细
-                mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId(), name));
+
                 if (StringUtils.isNotBlank(mzChargeDetail.getName())) {
                     List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByName(mzChargeDetail.getName());
                     if (mzPatientMis != null && mzPatientMis.size() > 0) {

+ 1 - 4
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -848,14 +848,11 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
      */
     @Override
     public List<MzChargeDetail> unPaidToFullChargeDetail(String patientId, String name) throws MzException {
-        /*if (StringUtils.isBlank(patientId)) {
+        if (StringUtils.isBlank(patientId)) {
             throw new MzException("病人编号不能为空!");
         }
         if (StringUtils.isBlank(name)) {
             throw new MzException("病人姓名不能为空!");
-        }*/
-        if(StringUtils.isBlank(patientId)) {
-            patientId = null;
         }
         List<Map<String, Object>> unPaidChargeDetails = mzChargeDetailMapper.selectUnPaidChargeDetail(patientId);
         List<Map<String, Object>> unPaidYjReqs = mzYjReqService.queryUnPaidYjReq(patientId);

+ 14 - 17
src/main/resources/static/js/mz/toll_administration.js

@@ -479,7 +479,7 @@ function initFeeTable() {
         sortable: true,                     //是否启用排序
         sortOrder: "asc",                   //排序方式
         queryParams: queryParams,           //传递参数(*)
-        sidePagination: "client",           //分页方式:client客户端分页,server服务端分页(*)
+        sidePagination: "server",           //分页方式:client客户端分页,server服务端分页(*)
         pageNumber: 1,                       //初始化加载第一页,默认第一页
         pageSize: 5,                       //每页的记录行数(*)
         pageList: [5, 10, 25, 50, 100],        //可供选择的每页的行数(*)
@@ -1142,18 +1142,24 @@ function queryParamsForRefundByBillItem(params) {
     };
 };
 
+function debounce(func, delay = 500) {
+    let timer = null;
+    return function(...args) {
+        clearTimeout(timer);
+        timer = setTimeout(() => {
+            func.apply(this, args); // 执行目标方法
+        }, delay);
+    };
+}
+
 /**
  * 卡号输入改变事件
  */
 function cardNoChange() {
     if (window.ActiveXObject || "ActiveXObject" in window) {
-        $("#cardNo").on('input propertychange', function () {
-            queryUserInfoByCardNo();
-        });
+        $("#cardNo").on('input propertychange', debounce(queryUserInfoByCardNo, 500));
     } else {
-        $("#cardNo").on('input οninput', function () {
-            queryUserInfoByCardNo();
-        });
+        $("#cardNo").on('input οninput', debounce(queryUserInfoByCardNo, 500));
     }
 }
 
@@ -1819,16 +1825,7 @@ function codePay() {
     });
 }
 
-/*function debounce(func, delay = 500) {
-    let timer = null;
-    return function(...args) {
-        clearTimeout(timer);
-        timer = setTimeout(() => {
-            func.apply(this, args); // 执行目标方法
-        }, delay);
-    };
-}
-
+/*
 $('#paymentCode').on('input', debounce(codePay, 500));*/
 
 /**