辅助检查子项目名称无需重复开单项

src/main/java/com/diagbot/entity/node/PacsSubName.java

@@ -1,6 +1,5 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import com.diagbot.entity.relationship.*;
 import lombok.Getter;
@@ -52,4 +51,7 @@ public class PacsSubName extends BaseNode  {
 	@Relationship(type = "辅助检查名称包含辅助检查子项目名称", direction = Relationship.INCOMING)
 	private Set<PacsNamePacsSubName> pacsNamePacsSubNames = new HashSet<>();
 
+	@Relationship(type = "辅助检查子项目名称无需重复开单项", direction = Relationship.OUTGOING)
+	private Set<PacsNameSubNeedlessItem> pacsNameSubNeedlessItems = new HashSet<>();
+
 }

src/main/java/com/diagbot/entity/relationship/PacsNameSubNeedlessItem.java

@@ -0,0 +1,21 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.NeedlessOrder;
+import com.diagbot.entity.node.PacsSubName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.EndNode;
+import org.neo4j.ogm.annotation.RelationshipEntity;
+import org.neo4j.ogm.annotation.StartNode;
+
+@Getter
+@Setter
+@RelationshipEntity(type = "辅助检查子项目名称无需重复开单项")
+public class PacsNameSubNeedlessItem extends BaseRelation {
+    @StartNode
+    private PacsSubName pacsName;
+
+    @EndNode
+    private NeedlessOrder needlessOrder;
+}

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

@@ -2,29 +2,8 @@ package com.diagbot.repository;
 
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.PacsBillNeoDTO;
-import com.diagbot.entity.node.Allergen;
-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.PacsSubName;
-import com.diagbot.entity.node.Vital;
-import com.diagbot.entity.relationship.PacsSubNameAllergen;
-import com.diagbot.entity.relationship.PacsSubNameClinicalFinding;
-import com.diagbot.entity.relationship.PacsSubNameConflictDevice;
-import com.diagbot.entity.relationship.PacsSubNameDisease;
-import com.diagbot.entity.relationship.PacsSubNameGender;
-import com.diagbot.entity.relationship.PacsSubNameGroup;
-import com.diagbot.entity.relationship.PacsSubNameLis;
-import com.diagbot.entity.relationship.PacsSubNameMedAllergen;
-import com.diagbot.entity.relationship.PacsSubNameOralMedicine;
-import com.diagbot.entity.relationship.PacsSubNamePacsDescribe;
-import com.diagbot.entity.relationship.PacsSubNameVital;
+import com.diagbot.entity.node.*;
+import com.diagbot.entity.relationship.*;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +49,17 @@ public class PacsSubNameNode {
         PacsBillNeoDTO pacsBillNeoDTO = new PacsBillNeoDTO();
         NodeInfo nodeInfo;
 
+        Set<PacsNameSubNeedlessItem> pacsNameNeedlessItems = pacs.getPacsNameSubNeedlessItems();
+        for (PacsNameSubNeedlessItem 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.getNeedlessPacsOrder().add(NeoUtil.updateNodeInfo(nodeInfo));
+                }
+            }
+        }
 
         PacsSubNameGender pacsSubNameGender = pacs.getPacsSubNameGender();
         if (NeoUtil.isExist(pacsSubNameGender)) {