更新医保手术的禁忌人群开单合理性

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

@@ -1,11 +1,13 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoOperationGroup;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
+import org.neo4j.ogm.annotation.RelationshipEntity;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -52,8 +54,8 @@ public class YiBaoOperationName extends BaseNode  {
 	@Relationship(type = "医保手术和操作名称禁忌疾病", direction = Relationship.OUTGOING)
 	private Set<Disease> diseases = new HashSet<>();
 
-	@Relationship(type = "医保手术和操作名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	@Relationship(type = "医保手术和操作名称禁忌禁忌人群")
+	private Set<YiBaoOperationGroup> groups = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
 	private Set<PacsDescribe> pacsdescs = new HashSet<>();

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.Group;
+import com.diagbot.entity.node.YiBaoOperationName;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter
+@RelationshipEntity(type = "医保手术和操作名称禁忌禁忌人群")
+public class YiBaoOperationGroup extends BaseRelation{
+    @StartNode
+    private YiBaoOperationName yiBaoOperationName;
+
+    @EndNode
+    private Group group;
+}

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

@@ -20,6 +20,7 @@ import com.diagbot.entity.node.OralMedicine;
 import com.diagbot.entity.node.PacsDescribe;
 import com.diagbot.entity.node.Vital;
 import com.diagbot.entity.node.YiBaoOperationName;
+import com.diagbot.entity.relationship.YiBaoOperationGroup;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.model.label.VitalLabel;
@@ -101,12 +102,15 @@ public class YiBaoOperationNameNode {
             opBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 
-        Set<Group> conflict_group = operation.getGroups();
-        for (Group group : conflict_group) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(group.getName());
-            nodeInfo.setTypeval(Constants.group);
-            opBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
+        Set<YiBaoOperationGroup> operationGroups = operation.getGroups();
+        for (YiBaoOperationGroup conflict_group : operationGroups) {
+            if (null!=conflict_group.getStatus() && conflict_group.getStatus()==1) {
+                Group group = conflict_group.getGroup();
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(group.getName());
+                nodeInfo.setTypeval(Constants.group);
+                opBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
         Set<PacsDescribe> conflict_pacsdesc = operation.getPacsdescs();