详情优化

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

@@ -2228,21 +2228,21 @@ public class MzChargeDetailController {
                 List<String> selfPayList = new ArrayList<>();
                 results.put("selfPayList", selfPayList);
                 results.put("zfcns_time", DateUtil.fomart(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                StringBuilder stringBuilder = new StringBuilder();
+                //StringBuilder stringBuilder = new StringBuilder();
 //                int patientDuringSiSettle = tsmzService.isPatientDuringSiSettle(mzChargeDetail.getPatientId());
 //                while (patientDuringSiSettle != 0) {
 //                    Thread.sleep(1000);
 //                    patientDuringSiSettle = tsmzService.isPatientDuringSiSettle(mzChargeDetail.getPatientId());
 //                }
-                Clinic clinic = clinicService.queryByPatientIdAndTimesAndReceiptNo(patientId, times, 0);
-                Integer countYbZf = (clinic == null || clinic.getZgmztczf() == null) ? YesNoEnum.NO.code : clinic.getZgmztczf();
-                if (YesNoEnum.YES.code.equals(countYbZf)) {
-                    MzVisitTable mzVisitTable = mzVisitTableService.queryByPatientIdAndTimes(patientId, times);
-                    if (mzVisitTable == null) {
-                        throw new MzException("病人就诊记录不存在！");
-                    }
-                    results.put("icdText", mzVisitTable.getIcdTextNew());
-                }
+//                Clinic clinic = clinicService.queryByPatientIdAndTimesAndReceiptNo(patientId, times, 0);
+//                Integer countYbZf = (clinic == null || clinic.getZgmztczf() == null) ? YesNoEnum.NO.code : clinic.getZgmztczf();
+//                if (YesNoEnum.YES.code.equals(countYbZf)) {
+//                    MzVisitTable mzVisitTable = mzVisitTableService.queryByPatientIdAndTimes(patientId, times);
+//                    if (mzVisitTable == null) {
+//                        throw new MzException("病人就诊记录不存在！");
+//                    }
+//                    results.put("icdText", mzVisitTable.getIcdTextNew());
+//                }
                 for (MzChargeDetail mz : mzChargeDetailList) {
                     if (Arrays.asList(Constants.TC, Constants.SSWRF).contains(mz.getBillItemCode())) {
                         continue;
@@ -2277,9 +2277,9 @@ public class MzChargeDetailController {
                     BigDecimal tempAmount = unitPrice.multiply(quantity).multiply(drugWin);
                     totalAmount = totalAmount.add(tempAmount);
                     map.put("itemTotalFee", amount.add(tempAmount));
-                    if (setPaySelfListForUnpaid(results, selfPayList, stringBuilder, countYbZf, mz)) {
-                        return results;
-                    }
+                    //if (setPaySelfListForUnpaid(results, selfPayList, stringBuilder, countYbZf, mz)) {
+                    //    return results;
+                    //}
                 }
                 totalAmount = totalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
                 BigDecimal selfAmount = totalAmount;

src/main/resources/static/js/mz/clinic.js

@@ -11339,7 +11339,7 @@ function prescriptionDetailCommon(patientId, times, clnicId, payMark, type) {
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
-        async: false,
+        async: true,
         success: function (res) {
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'