其他提醒化验修改提示语

src/main/java/com/diagbot/dto/BillNeoMaxDTO.java

@@ -66,4 +66,7 @@ public class BillNeoMaxDTO {
     // 禁用辅助检查描述
     private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
 
+    // 互斥开单辅助检查
+    private List<NodeNeoDTO> pacsOrder = new ArrayList<>();
+
 }

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

@@ -168,8 +168,8 @@ public class TestFacade {
                         indicationPushVO.setDiag(diag);
                         break;
                     case "6": // 服用药品
-                        StringBuffer symptom = new StringBuffer("发病来，神志清，精神可，胃纳一般，睡眠可，二便无殊。一直服用");
-                        symptom.append(bean.getNeoName()).append("。");
+                        StringBuffer symptom = new StringBuffer("发病来，神志清，精神可，胃纳一般，睡眠可，二便无殊。一直服用“");
+                        symptom.append(bean.getNeoName()).append("”。");
                         indicationPushVO.setSymptom(symptom.toString());
                         break;
                     case "7" : // 药品过敏原

src/main/java/com/diagbot/process/BillProcess.java

@@ -266,6 +266,8 @@ public class BillProcess {
 
         // 24小时重复开单项
         commonRule.repeat24Bill(wordCrfDTO, billMsgList);
+
+        // 互斥开单项
         indicationDTO.setBillMsgList(billMsgList);
     }
 

src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -42,20 +43,20 @@ public class OtherTipProcess {
 
             if (ListUtil.isNotEmpty(factor)) {
                 for (NodeNeoDTO nodeNeoDTO : factor) {
-                    Boolean flag = false;
+                    Map map = null;
                     if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) { // 诊断
-                        flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDiag());
+                        map = CoreUtil.compareNameWithNode(nodeNeoDTO, wordCrfDTO.getDiag());
                     } else if (TypeEnum.drug.getName().equals(nodeNeoDTO.getTermtype())) { // 药品
-                        flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDrug());
+                        map = CoreUtil.compareNameWithNode(nodeNeoDTO, wordCrfDTO.getDrug());
                     }
-                    if (flag) {
+                    if (map != null && (Boolean)map.get("flag") == true) {
                         String content = otherTipNeoDTO.getName() + otherTipNeoDTO.getDetailName();
                         if (StringUtil.isNotBlank(otherTipNeoDTO.getOtherValue())) {
                             content += otherTipNeoDTO.getOtherValue();
                         } else {
                             content += CoreUtil.subZeroAndDot(otherTipNeoDTO.getValue().toString());
                         }
-                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, nodeNeoDTO.getName(), nodeNeoDTO.getTermtype());
+                        BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, (String)map.get("msg"), nodeNeoDTO.getTermtype());
                         res.getOtherList().add(billMsg);
                     }
                 }

src/main/java/com/diagbot/rule/CommonRule.java

@@ -1,5 +1,6 @@
 package com.diagbot.rule;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.HighRiskNeoDTO;
@@ -110,6 +111,17 @@ public class CommonRule {
         repeat24BillWithType(billMsgList, wordCrfDTO.getTransfusionOrder(), TypeEnum.transfusion.getName()); // 输血重复开单
     }
 
+    /**
+     * 互斥开单项
+     *
+     * @param wordCrfDTO
+     * @param billMsgList
+     */
+    public void exclusionBill(WordCrfDTO wordCrfDTO, List<BillMsg> billMsgList) {
+        // 当前辅检开单项
+        List<Pacs> pacsOrder = wordCrfDTO.getPacsOrder();
+    }
+
     /**
      * 24小时重复开单入口
      *

src/main/java/com/diagbot/util/CoreUtil.java

@@ -264,16 +264,20 @@ public class CoreUtil {
      * @param item
      * @return
      */
-    public static Boolean compareNameWithNodeNeoDTO(NodeNeoDTO nodeNeoDTO,  List<? extends Item> item) {
-        if (ListUtil.isEmpty(item) || nodeNeoDTO == null) {
-            return false;
-        }
-        for (Item it : item) {
-            if (it.getUniqueName().equals(nodeNeoDTO.getName())) {
-                return true;
+    public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO,  List<? extends Item> item) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        boolean flag = false;
+        if (ListUtil.isNotEmpty(item) && nodeNeoDTO != null) {
+            for (Item it : item) {
+                if (it.getUniqueName().equals(nodeNeoDTO.getName())) {
+                    flag = true;
+                    map.put("msg", it.getName());
+                    break;
+                }
             }
         }
-        return  false;
+        map.put("flag", flag);
+        return map;
     }
 
     /**