'接诊配置与必填项被覆盖代码恢复'

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

@@ -1369,17 +1369,20 @@ 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.getMzBlRecord().getEmrChiefComplaint() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint())) {
-        //        throw new MzException("请完善主诉内容！");
-        //    }
-        //    if (mzPrescriptionVo.getMzBlRecord().getEmrHpi() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrHpi())) {
-        //        throw new MzException("请完善现病史内容！");
-        //    }
-        //    if (mzPrescriptionVo.getMzBlRecord().getEmrPs() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPs())) {
-        //        throw new MzException("请完善既往史内容！");
-        //    }
-        //}
+        if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) {
+            if (mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint())) {
+                throw new MzException("请完善主诉内容！");
+            }
+            if (mzPrescriptionVo.getMzBlRecord().getEmrHpi() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrHpi())) {
+                throw new MzException("请完善现病史内容！");
+            }
+            if (mzPrescriptionVo.getMzBlRecord().getEmrPs() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPs())) {
+                throw new MzException("请完善既往史内容！");
+            }
+            if (mzPrescriptionVo.getMzBlRecord().getEmrPe() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPe())) {
+                throw new MzException("请完善体格检查内容！");
+            }
+        }
          boolean checkWpFlag = wpMzPrescriptionService.checkMzPrescription(mzPrescriptionVo);
         if(!checkWpFlag){
             throw new MzException("外配处方不能和其他处方组合开具,只能单独开！");

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

@@ -2746,13 +2746,13 @@
                          style="font-size: 14px;font-weight: 700;line-height: 39px;">
                         <div class="checkbox">
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
-                                <input type="checkbox" class="flat" id="symptomFlagCheck">&nbsp;&nbsp;主诉
+                                <input type="checkbox" checked disabled class="flat" id="symptomFlagCheck">&nbsp;&nbsp;主诉
                             </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
-                                <input type="checkbox" class="flat" id="emrHpiFlagCheck">&nbsp;&nbsp;现病史
+                                <input type="checkbox" checked disabled class="flat" id="emrHpiFlagCheck">&nbsp;&nbsp;现病史
                             </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
-                                <input type="checkbox" class="flat" id="emrPsFlagCheck">&nbsp;&nbsp;既往史
+                                <input type="checkbox" checked disabled class="flat" id="emrPsFlagCheck">&nbsp;&nbsp;既往史
                             </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
                                 <input type="checkbox" class="flat" id="personalHistoryFlagCheck">&nbsp;&nbsp;个人史
@@ -2773,7 +2773,7 @@
                                 <input type="checkbox" class="flat" id="pressureLeftFlagCheck">&nbsp;&nbsp;血压（左）
                             </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
-                                <input type="checkbox" class="flat" id="tentativeDiagnosisFlagCheck">&nbsp;&nbsp;初步诊断
+                                <input type="checkbox" checked disabled class="flat" id="tentativeDiagnosisFlagCheck">&nbsp;&nbsp;初步诊断
                             </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
                                 <input type="checkbox" class="flat" id="checkboxFlagCheck">&nbsp;&nbsp;处方回调