Home Explore Help
Register Sign In
java
/
cdss-core
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

分支合并

zhoutg 4 years ago
parent
287bf475a1
commit
23d8e7b1c8
13 changed files with 23 additions and 40 deletions
Unified View Show Diff Stats
  1. 2 2
      src/main/java/com/diagbot/entity/node/Allergen.java
  2. 2 1
      src/main/java/com/diagbot/entity/node/ClinicalFinding.java
  3. 2 2
      src/main/java/com/diagbot/entity/node/ConflictDevice.java
  4. 2 2
      src/main/java/com/diagbot/entity/node/Disease.java
  5. 2 2
      src/main/java/com/diagbot/entity/node/Gender.java
  6. 2 2
      src/main/java/com/diagbot/entity/node/Group.java
  7. 2 1
      src/main/java/com/diagbot/entity/node/Lis.java
  8. 2 2
      src/main/java/com/diagbot/entity/node/MedAllergen.java
  9. 2 2
      src/main/java/com/diagbot/entity/node/OralMedicine.java
  10. 0 21
      src/main/java/com/diagbot/entity/node/Pacs.java
  11. 1 0
      src/main/java/com/diagbot/entity/node/PacsDescribe.java
  12. 2 2
      src/main/java/com/diagbot/entity/node/PacsSubName.java
  13. 2 1
      src/main/java/com/diagbot/entity/node/Vital.java

+ 2 - 2
src/main/java/com/diagbot/entity/node/Allergen.java
View File 

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

+ 2 - 1
src/main/java/com/diagbot/entity/node/ClinicalFinding.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/ConflictDevice.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/Disease.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/Gender.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/Group.java
View File 

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

+ 2 - 1
src/main/java/com/diagbot/entity/node/Lis.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/MedAllergen.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/OralMedicine.java
View File 

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

+ 0 - 21
src/main/java/com/diagbot/entity/node/Pacs.java
View File 

@@ -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<>();
 
-
 
-}

+ 1 - 0
src/main/java/com/diagbot/entity/node/PacsDescribe.java
View File 

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

+ 2 - 2
src/main/java/com/diagbot/entity/node/PacsSubName.java
View File 

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

+ 2 - 1
src/main/java/com/diagbot/entity/node/Vital.java
View File 

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