湘雅三院报告单限制修改

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -95,15 +95,14 @@ public class DataPageDockFacade {
         // 将基本参数保存到redis
         String mrId = mrFacade.createMr(pushJoinVO);
         //开单合理性推理时，验证下是否有推送，无推送时，不给url,code为“-1”
-        if (dataPageDockVO.getPlanCode().equals("order_rational") || dataPageDockVO.getPlanCode().equals("medical_lis") || dataPageDockVO.getPlanCode().equals("medical_pacs")) {
+        if (dataPageDockVO.getPlanCode().equals("order_rational")) {
             IndicationPushVO indicationPushVO = new IndicationPushVO();
             //初始化开单合理性入参
             BeanUtil.copyProperties(dataPageDockVO, indicationPushVO);
             indicationPushVO.setRuleType("1,2,3,4");
             IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
             if (indicationDTO != null) {
-                if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList()) || ListUtil.isNotEmpty(indicationDTO.getHighRiskList())
-                        || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList())) {
+                if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList())) {
                     pushMrId = mrFacade.createIndicationMr(indicationDTO);
                 } else {
                     return RespDTO.onError("无开单合理性提醒！");
@@ -112,6 +111,23 @@ public class DataPageDockFacade {
                 return RespDTO.onError("无开单合理性提醒！");
             }
         }
+        if (dataPageDockVO.getPlanCode().equals("medical_lis") || dataPageDockVO.getPlanCode().equals("medical_pacs")) {
+            IndicationPushVO indicationPushVO = new IndicationPushVO();
+            //初始化开单合理性入参
+            BeanUtil.copyProperties(dataPageDockVO, indicationPushVO);
+            indicationPushVO.setRuleType("1,2,3,4");
+            IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
+            if (indicationDTO != null) {
+                if (ListUtil.isNotEmpty(indicationDTO.getOtherList())|| ListUtil.isNotEmpty(indicationDTO.getCriticalValList())) {
+                    pushMrId = mrFacade.createIndicationMr(indicationDTO);
+                } else {
+                    return RespDTO.onError("无开单合理性提醒！");
+                }
+            } else {
+                return RespDTO.onError("无开单合理性提醒！");
+            }
+        }
+
         if ("hor".equals(dataPageDockVO.getShowType())) {
             url = dataPageUrl + "/cdssHorizontal.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
         } else {