开单新规则

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

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

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

@@ -20,4 +20,6 @@ public class NodeInfo {
     String typeval;
     // 匹配类型
     Integer matchtype;
+    // 正则规则
+    private String regex;
 }

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

@@ -5,42 +5,12 @@ import com.diagbot.dto.PacsBillNeoDTO;
 import com.diagbot.entity.BaseNodeInfo;
 import com.diagbot.entity.node.*;
 import com.diagbot.entity.relationship.*;
-import com.diagbot.entity.relationship.base.BaseRelation;
-import com.diagbot.entity.node.Allergen;
-import com.diagbot.entity.node.BillConflictItem;
-import com.diagbot.entity.node.ClinicalFinding;
-import com.diagbot.entity.node.ConflictDevice;
-import com.diagbot.entity.node.Disease;
-import com.diagbot.entity.node.Gender;
-import com.diagbot.entity.node.Group;
-import com.diagbot.entity.node.Lis;
-import com.diagbot.entity.node.MedAllergen;
-import com.diagbot.entity.node.OralMedicine;
-import com.diagbot.entity.node.PacsDescribe;
-import com.diagbot.entity.node.PacsName;
-import com.diagbot.entity.node.Vital;
-import com.diagbot.entity.relationship.PacsNameAllergen;
-import com.diagbot.entity.relationship.PacsNameBillConflictItem;
-import com.diagbot.entity.relationship.PacsNameClinicalFinding;
-import com.diagbot.entity.relationship.PacsNameConflictDevice;
-import com.diagbot.entity.relationship.PacsNameDisease;
-import com.diagbot.entity.relationship.PacsNameGender;
-import com.diagbot.entity.relationship.PacsNameGroup;
-import com.diagbot.entity.relationship.PacsNameLis;
-import com.diagbot.entity.relationship.PacsNameMedAllergen;
-import com.diagbot.entity.relationship.PacsNameOralMedicine;
-import com.diagbot.entity.relationship.PacsNamePacsDescribe;
-import com.diagbot.entity.relationship.PacsNameVital;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
@@ -78,6 +48,19 @@ public class PacsNameNode {
         PacsBillNeoDTO pacsBillNeoDTO = new PacsBillNeoDTO();
         NodeInfo nodeInfo;
 
+        Set<PacsNameNeedlessItem> pacsNameNeedlessItems = pacs.getPacsNameNeedlessItems();
+        for (PacsNameNeedlessItem pacsNameNeedlessItem : pacsNameNeedlessItems) {
+            if (NeoUtil.isExist(pacsNameNeedlessItem)) {
+                if (NeoUtil.isExist(pacsNameNeedlessItem.getNeedlessOrder())) {
+                    nodeInfo = new NodeInfo();
+                    nodeInfo.setName(pacsNameNeedlessItem.getNeedlessOrder().getName());
+                    nodeInfo.setRegex(pacsNameNeedlessItem.getNeedlessOrder().getName());
+                    pacsBillNeoDTO.getPacsNoDouble().add(NeoUtil.updateNodeInfo(nodeInfo));
+                }
+            }
+        }
+
+
 
         PacsNameGender pacsNamegender = pacs.getPacsNameGender();
         if (NeoUtil.isExist(pacsNamegender)) {