开单新规则

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

@@ -54,7 +54,7 @@ public class PacsBillNeoDTO {
     // 禁用辅助检查描述
     private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
 
-    //辅助结果正常，重复开单
-    private List<NodeNeoDTO> pacsNoDouble = new ArrayList<>();
+    // 无需重复辅检开单项
+    private List<NodeNeoDTO> needlessPacsOrder = new ArrayList<>();
 
 }

src/main/java/com/diagbot/repository/NodeInfo.java

@@ -21,5 +21,5 @@ public class NodeInfo {
     // 匹配类型
     Integer matchtype;
     // 正则规则
-    private String regex;
+    private String regex = "";
 }

src/main/java/com/diagbot/repository/PacsNameNode.java

@@ -55,7 +55,7 @@ public class PacsNameNode {
                     nodeInfo = new NodeInfo();
                     nodeInfo.setName(pacsNameNeedlessItem.getNeedlessOrder().getName());
                     nodeInfo.setRegex(pacsNameNeedlessItem.getNeedlessOrder().getName());
-                    pacsBillNeoDTO.getPacsNoDouble().add(NeoUtil.updateNodeInfo(nodeInfo));
+                    pacsBillNeoDTO.getNeedlessPacsOrder().add(NeoUtil.updateNodeInfo(nodeInfo));
                 }
             }
         }

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

@@ -212,7 +212,7 @@ public class MsgUtil {
      */
     public static BillMsg getNeedlessRepeatOrder(String orderName, String orderStandName, String content, String type) {
         BillMsg billMsg = new BillMsg();
-        String msg = String.format("重复开立：该患者近期做过%s，且结果无异常", orderName);
+        String msg = String.format("重复开立：该患者近期做过%s，且结果无异常", content);
         billMsg.setMsg(msg);
         billMsg.setOrderName(orderName);
         billMsg.setOrderStandName(orderStandName);

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

@@ -3,7 +3,6 @@ package com.diagbot.util;
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.PushBaseDTO;
-import com.diagbot.entity.node.Vital;
 import com.diagbot.entity.node.YiBaoDiseaseName;
 import com.diagbot.entity.node.base.BaseNode;
 import com.diagbot.entity.relationship.YiBaoDiseaseNameLisBigName;
@@ -14,7 +13,6 @@ import com.diagbot.entity.relationship.base.BaseRelation;
 import com.diagbot.model.entity.PD;
 import com.diagbot.repository.Constants;
 import com.diagbot.repository.NodeInfo;
-import com.diagbot.repository.datautil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
@@ -33,6 +31,8 @@ public class NeoUtil {
 //        name = datautil.removekey(name, Constants.conflict);
         nodeNeoDTO.setName(name);
 
+        nodeNeoDTO.setRegex(nodeInfo.getRegex());
+
         BigDecimal min = nodeInfo.getMinval();
         if (null!=min) {
             nodeNeoDTO.setMin(min);