优化

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

@@ -95,7 +95,7 @@ public class MzyRequestController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getUnitCodeByRequestDay", method = {RequestMethod.GET, RequestMethod.POST})
-    public Map<String, Object> getUnitCodeByRequestDay(@RequestParam("ampm") String ampm, @RequestParam("apTimes") String apTimes) {
+    public Map<String, Object> getUnitCodeByRequestDay(@RequestParam(value = "ampm",required = false)  String ampm, @RequestParam(name="apTimes",required = false) String apTimes) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(ampm)) {
@@ -259,7 +259,7 @@ public class MzyRequestController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getDoctorCodeByRequestDay", method = {RequestMethod.GET, RequestMethod.POST})
-    public Map<String, Object> getDoctorCodeByRequestDay(@RequestParam("unitCode") String unitCode, @RequestParam("ampm") String ampm, @RequestParam("chargeType") String chargeType, @RequestParam("apTime") String apTime) {
+    public Map<String, Object> getDoctorCodeByRequestDay(@RequestParam("unitCode") String unitCode, @RequestParam(value = "ampm",required = false) String ampm, @RequestParam(value = "chargeType",required = false) String chargeType, @RequestParam(value = "apTime",required = false) String apTime) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(unitCode)) {

src/main/java/cn/hnthyy/thmz/enums/OrderFrequencyEnum.java

@@ -51,7 +51,8 @@ public enum OrderFrequencyEnum {
     BEFORE_MEALS("三餐前","三餐前",3),
     ONCE_A_DAY("一次/单日","一次/单日",1),
     TWICE_ONE_DAY("一天两次","一天两次",2),
-    ONCE_TWO_DAY("一次/双日","一次./双日",1);
+    ONCE_TWO_DAY("一次/双日","一次./双日",1),
+    Q72H("Q72H","一次/间隔72小时",1);
 
 
     public String code;
@@ -73,7 +74,7 @@ public enum OrderFrequencyEnum {
      * 西药频率
      */
     public static List<OrderFrequencyEnum> WESTERN_MEDICINE_ORDER_FREQUENCY=Arrays.asList(ALWAYS,BID,IRREG,ONCE,Q12H,Q1H,Q2H,Q30FZ,Q3H,Q4H,Q5H,Q6H,Q7H,Q8H,QD,QID,QN,QOD,
-            QWD,TID,W1D,W1D2,W1D3,W1D4,W1D5,W1D6,W2D,W2D1,W2D2,W2D3,W2D4,W3D,W3D1,W3D2,W3D3,W3D4,W5D,PBG_BID,BM_BID);
+            QWD,TID,W1D,W1D2,W1D3,W1D4,W1D5,W1D6,W2D,W2D1,W2D2,W2D3,W2D4,W3D,W3D1,W3D2,W3D3,W3D4,W5D,PBG_BID,BM_BID,Q72H);
     /**
      * 根据编码查询对应的类型
      * @param code

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

@@ -36,6 +36,7 @@ import cn.hnthyy.thmz.service.thmz.*;
 import cn.hnthyy.thmz.vo.MzDepositFileVo;
 import cn.hnthyy.thmz.vo.MzPrescriptionVo;
 import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
+import cn.hutool.core.collection.CollUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Transformer;
@@ -1112,15 +1113,15 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (realIcdText == null) {
             throw new MzException("标准诊断不能为空！");
         }
-        if (mzPrescriptionVo.getMzYjReqList() != null && mzPrescriptionVo.getMzYjReqList().size() > 0) {
+        if (mzPrescriptionVo.getMzZyReq() !=null || CollUtil.isNotEmpty(mzPrescriptionVo.getMzYjReqList())) {
             if (mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint())) {
-                throw new MzException("本次处方有医技申请，请完善主诉内容！");
+                throw new MzException("请完善主诉内容！");
             }
             if (mzPrescriptionVo.getMzBlRecord().getEmrHpi() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrHpi())) {
-                throw new MzException("本次处方有医技申请，请完善现病史内容！");
+                throw new MzException("请完善现病史内容！");
             }
             if (mzPrescriptionVo.getMzBlRecord().getEmrPs() == null || StringUtils.isBlank(mzPrescriptionVo.getMzBlRecord().getEmrPs())) {
-                throw new MzException("本次处方有医技申请，请完善既往史内容！");
+                throw new MzException("请完善既往史内容！");
             }
         }
 

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

@@ -1065,8 +1065,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         if (StringUtils.isBlank(mzPatientMi.getPatientId())) {
             throw new MzException("患者ID不能为空！");
         }
-        if (mzPatientMi.getTimes() == null) {
-            throw new MzException("患者就诊次数不能为空！");
+        if (mzPatientMi.getTimes() == null ) {
+            mzPatientMi.setTimes(1);
         }
         MzVisitTable lastMzVisitTable = mzVisitTableService.queryLastMzVisitTableByPatientId(mzPatientMi.getPatientId());
         int times = 0;

src/main/java/cn/hnthyy/thmz/service/impl/thmz/TurnToConsultationServiceImpl.java

@@ -58,9 +58,9 @@ public class TurnToConsultationServiceImpl implements TurnToConsultationService
         }
         turnToConsultation.setOpDate(new Date());
         if (TurnToConsultation.ZZ.equals(turnToConsultation.getOpType())) {
-            if (Constants.SIMPLE_OUTPATIENT_CODE.equals(mzfzPatientOrder.getReqType()) || Constants.FREE_TO_REGISTER_CODE.equals(mzfzPatientOrder.getReqType())) {
-                throw new MzException("简易门诊无需转诊!");
-            }
+            //if (Constants.SIMPLE_OUTPATIENT_CODE.equals(mzfzPatientOrder.getReqType()) || Constants.FREE_TO_REGISTER_CODE.equals(mzfzPatientOrder.getReqType())) {
+            //    throw new MzException("简易门诊无需转诊!");
+            //}
             mzfzPatientOrder.setDeptCode(turnToConsultation.getTargetDeptNo());
             mzfzPatientOrder.setDoctorCode(turnToConsultation.getTargetDoctorNo());
             mzfzPatientOrder.setStatusFlag(MzfzStatusEnum.UN_TRIAGE.code);

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

@@ -2188,7 +2188,7 @@ function realClinicalReception(patientId, serialNo, reqType) {
                     $("#mzfzReqTypeNoInClick").val(reqType);
                     //有分诊流水号 且 不是简易门诊 或 会诊目标科室接诊
                     if (serialNo != null && serialNo != "null") {
-                        if (!(reqType == 10 || reqType == "10" || reqType == "16" || reqType == 16 || reqType == -200)) {
+                        if (!( reqType == "16" || reqType == 16 || reqType == -200)) {
                             $("#transferTreatment").css("display", "inline-block");
                         }
                         $("#consultation").css("display", "inline-block");
@@ -12642,7 +12642,7 @@ function transferTreatment() {
     //科室列表
     $.ajax({
         type: "GET",
-        url: '/thmz/getUnitCodeByRequestDay?ampm=',
+        url: '/thmz/getUnitCodeByRequestDay',
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (data) {
@@ -12847,7 +12847,7 @@ function initEmployee() {
     //医生列表
     $.ajax({
         type: "GET",
-        url: '/thmz/getDoctorCodeByRequestDay?unitCode=' + $('#turnDept').val() + "&ampm=&chargeType=",
+        url: '/thmz/getDoctorCodeByRequestDay?unitCode=' + $('#turnDept').val(),
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {