分支合并

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,8 +8,8 @@ import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,8 +8,8 @@ import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,21 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.Set;
-import java.util.HashSet;
-
-@Setter
-@Getter
-@NodeEntity(label = "辅助检查")
-public class Pacs extends BaseNode  {
-
-
-	@Relationship(type = "辅助检查禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> liss = new HashSet<>();
-
-}

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,14 +1,14 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 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 java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,8 +8,8 @@ import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 @Setter
 @Getter