Browse Source

去除接诊信息校验

yeguodong 3 weeks ago
parent
commit
75dcb0d651

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

@@ -1372,7 +1372,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (realIcdText == null && (StringUtils.isBlank(mzPrescriptionVo.getTcmIcdText()) || StringUtils.isBlank(mzPrescriptionVo.getTcmIcdText().replaceAll(",","")))) {
             throw new MzException("标准诊断或中医诊断不能为同时为空!");
         }
-        if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) {
+        /*if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) {
             if (mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint())) {
                 throw new MzException("请完善主诉内容!");
             }
@@ -1385,7 +1385,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             if (mzPrescriptionVo.getMzBlRecord().getEmrPe() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPe())) {
                 throw new MzException("请完善体格检查内容!");
             }
-        }
+        }*/
          boolean checkWpFlag = wpMzPrescriptionService.checkMzPrescription(mzPrescriptionVo);
         if(!checkWpFlag){
             throw new MzException("外配处方不能和其他处方组合开具,只能单独开!");

+ 6 - 9
src/main/resources/static/js/mz/registration.js

@@ -211,14 +211,6 @@ $(function () {
     //     }
     // });
 
-    function payByCode() {
-
-    }
-
-    $("#codePay").on("click", function (t) {
-        payByCode();
-    });
-
 
     /**
      * 保存挂号信息
@@ -247,7 +239,12 @@ $(function () {
         if (patientId == null || patientId == "") {
             savePatient(1);
         } else {
-            codePay(() => saveMzyReqrec());
+            if ($("#payType").val() == 1) {
+                saveMzyReqrec();
+            } else {
+                codePay(() => saveMzyReqrec());
+            }
+
         }
 
     });