优化门诊收费字典逻辑。门诊自费承诺书增加日期选项

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

@@ -111,7 +111,7 @@ public class ChargeFeeVoController {
      */
     private void fomartChargeVo(List<ChargeFeeVo> chargeFeeVos, YesNoEnum fitEmpName,YesNoEnum fitPatientInfo) {
         if (chargeFeeVos != null && chargeFeeVos.size() > 0) {
-            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
             Map<String, String> employeeMap = null;
             if (YesNoEnum.YES.equals(fitEmpName)) {
                 Set<String> opIds = chargeFeeVos.stream().filter(u -> StringUtils.isNotBlank(u.getOpId())).map(u -> u.getOpId()).collect(Collectors.toSet());
@@ -304,7 +304,7 @@ public class ChargeFeeVoController {
                     }
                 }
             }
-            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
             Map<String, String> chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
             for (ReqrecVo ro : reqrecVos) {
                 ro.setUnitCode(zdUnitCodeService.queryDeptNameByIdInCache(ro.getUnitCode()));

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

@@ -811,7 +811,7 @@ public class MzChargeDetailController {
             //页面回显的退款明细
             List<MzDepositFile> refundMzDepositFiles = (List<MzDepositFile>) map.get("refundMzDepositFiles");
             if (refundMzDepositFiles != null && refundMzDepositFiles.size() > 0) {
-                List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+                List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
                 Map<String, String> chequeTypeMap = null;
                 if (chequeTypes != null) {
                     chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
@@ -2025,6 +2025,7 @@ public class MzChargeDetailController {
                 BigDecimal totalAmount = BigDecimal.ZERO;
                 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();
 //                int patientDuringSiSettle = tsmzService.isPatientDuringSiSettle(mzChargeDetail.getPatientId());
 //                while (patientDuringSiSettle != 0) {

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

@@ -146,7 +146,7 @@ public class MzDepositFileController {
 //                receiptNo = mzDepositFile.getReceiptNo() + 1;
 //            }
             Map<String, String> chequeTypeMap = null;
-            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
             if (chequeTypes != null) {
                 chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
             }

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

@@ -541,7 +541,7 @@ public class MzReceiptSerialController {
             MzDepositFile mz = new MzDepositFile(patientId, times);
             mz.setReceiptNo(receiptNo);
             List<MzDepositFile> mzDepositFiles = mzDepositFileService.queryMzDepositFile(mz);
-            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
             Map<String, String> chequeTypeMap = null;
             if (chequeTypes != null) {
                 chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -885,7 +885,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         if (employees != null) {
             employeeMap = employees.stream().collect(Collectors.toMap(Employee::getEmployeeCode, Employee::getEmployeeName));
         }
-        List<ZdChequeType> chequeTypes = zdChequeTypeMapper.selectAllZdChequeTypeForMz();
+        List<ZdChequeType> chequeTypes = zdChequeTypeMapper.selectAllZdChequeType();
         Map<String, String> chequeTypeMap = null;
         if (chequeTypes != null) {
             chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));

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

@@ -10170,6 +10170,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                             }
                             if (res.code == 0) {
                                 var selfPayList = res.selfPayList;
+                                $("#zfcns_time").text("时间："+res.zfcns_time);
                                 if (selfPayList != null && selfPayList.length > 0) {
                                     $("#patientNameSelfPay").text(mzPatientMi.name);
                                     $("#patientGenderSelfPay").text(mzPatientMi.gender);

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

@@ -189,6 +189,7 @@ $(function () {
     initListSelect();
 
     $("#queryListButton").on("click", function (t) {
+        $("#queryListButton").attr("disabled", true);
         loadTableCount();
         loadRegistrationList(true);
     });
@@ -1191,6 +1192,7 @@ function loadCardList() {
                     $("#card_regi_list").append(html);
                 }
             }
+            $("#queryListButton").attr("disabled", false);
         }
     });
 }
@@ -1459,6 +1461,7 @@ function loadTableList() {
                     return;
                 }
                 var ress = eval(res);
+                $("#queryListButton").attr("disabled", false);
                 if (ress.code == -1) {
                     new PNotify({
                         title: '错误提示',

src/main/resources/templates/mz/clinic.html

@@ -3676,6 +3676,10 @@
                 <td style="font-size: 13px;">地址：长沙市开福区芙蓉北路529号</td>
                 <td style="font-size: 13px;"><span style="margin-left: 110px;">总机：0731——88518888</span></td>
             </tr>
+            <tr>
+                <td style="font-size: 13px;" id="zfcns_time"></td>
+                <td style="font-size: 13px;"><span style="margin-left: 110px;"></span></td>
+            </tr>
             </tbody>
         </table>
     </div>