图谱查询时，添加对关系状态的查询

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

@@ -1,7 +1,8 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedRegNameAge;
+import com.diagbot.entity.relationship.MedicineAge;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -29,9 +30,9 @@ public class Age extends BaseNode  {
 	private String termname;
 
 	@Relationship(type = "药品通用名称禁忌年龄", direction = Relationship.INCOMING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<MedicineAge> medicineAges = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.INCOMING)
-	private Set<MedRegName> medRegNames = new HashSet<>();
+	private Set<MedRegNameAge> medRegNameAges = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsNameAllergen;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +17,6 @@ public class Allergen extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称禁忌过敏原", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameAllergen> pacsNameAllergens = new HashSet<>();
 
 }

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

@@ -1,7 +1,8 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsNameClinicalFinding;
+import com.diagbot.entity.relationship.YiBaoOperationNameClinicalFinding;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -29,9 +30,9 @@ public class ClinicalFinding extends BaseNode  {
 	private Integer range;
 
 	@Relationship(type = "辅助检查名称禁忌临床表现", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameClinicalFinding> pacsNameClinicalFindings = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌临床表现", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameClinicalFinding> yiBaoOperationNameClinicalFindings = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -20,21 +21,21 @@ public class CombiOperation extends BaseNode  {
 	private String combi_name;
 
 	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> liss = new HashSet<>();
+	private Set<CombiOperationLis> combiOpLiss = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
-	private Set<PacsDescribe> pacsdescs = new HashSet<>();
+	private Set<CombiOperationPacsDescribe> combiOppacsdescs = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> diseases = new HashSet<>();
+	private Set<CombiOperationDisease> combiOpdiseases = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<CombiOperationGroup> combiOpgroups = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medallergens = new HashSet<>();
+	private Set<CombiOperationMedAllergen> combiOpmedallergens = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private CombiOperationGender combiOpgender;
 
 }

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

@@ -1,7 +1,8 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsNameConflictDevice;
+import com.diagbot.entity.relationship.YiBaoOperationNameConflictDevice;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,9 +18,9 @@ public class ConflictDevice extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称禁忌禁忌医疗器械及物品", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameConflictDevice> pacsConflictDevices = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌禁忌医疗器械及物品", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameConflictDevice> yiBaoOperationNameConflictDevices = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameDept;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +17,6 @@ public class Dept extends BaseNode  {
 
 
 	@Relationship(type = "医保疾病名称相关科室", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<YiBaoDiseaseNameDept> diseaseDept = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,21 +17,21 @@ public class Disease extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameDisease> yibaooperationnameDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameDisease> pacsNameDiseases = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationDisease> combioperationDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+	private Set<PacsNameSubNameDisease> pacsnamesubnameDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<PacsSubName> pacssubnames = new HashSet<>();
+	private Set<PacsSubNameDisease> pacssubnameDiseases = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<MedicineDisease> medicineDiseases = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,21 +17,21 @@ public class Gender extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameGender> pacsNameGenders = new HashSet<>();
 
 	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.INCOMING)
-	private Set<LisSet> lissets = new HashSet<>();
+	private Set<LisSetGender> lissetGenders = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameGender> yibaooperationnameGenders = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+	private Set<PacsNameSubNameGender> pacsnamesubnameGenders = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌性别", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationGender> combioperationGenders = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameGender> lisnameGenders = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,29 +17,29 @@ public class Group extends BaseNode  {
 
 
 	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameGroup> lisnameGroups = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameGroup> yibaooperationnameGroups = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameGroup> pacsNameGroups = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationGroup> combioperationGroups = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+	private Set<PacsNameSubNameGroup> pacsnamesubnameGroups = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<PacsSubName> pacssubnames = new HashSet<>();
+	private Set<PacsSubNameGroup> pacssubnameGroups = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<MedicineGroup> medicineGroups = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<MedRegName> medRegNames = new HashSet<>();
+	private Set<MedRegNameGroup> medRegNameGroups = new HashSet<>();
 
 	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<LisSet> lisSets = new HashSet<>();
+	private Set<LisSetGroup> lisSetGroups = new HashSet<>();
 }

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

@@ -1,10 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameGuoLinDiseaseName;
 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;
@@ -17,6 +17,6 @@ public class GuoLinDiseaseName extends BaseNode  {
 
 
 	@Relationship(type = "医保疾病名称相关国临疾病名称", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> yibaodiseasenames = new HashSet<>();
+	private Set<YiBaoDiseaseNameGuoLinDiseaseName> yibaodiseasenameGuoLinDiseaseNames = new HashSet<>();
 
 }

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

@@ -1,10 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameGuoLinICD_10Code;
 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;
@@ -17,6 +17,6 @@ public class GuoLinICD_10Code extends BaseNode  {
 
 
 	@Relationship(type = "医保疾病名称相关国临ICD-10代码", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> yibaodiseasenames = new HashSet<>();
+	private Set<YiBaoDiseaseNameGuoLinICD_10Code> yibaodiseasenameGuoLinICD_10Codes = new HashSet<>();
 
 }

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

@@ -1,10 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoOperationNameGuoLinICD_9_CM3Code;
 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;
@@ -17,6 +17,6 @@ public class GuoLinICD_9_CM3Code extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称相关国临ICD-9-CM3代码", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameGuoLinICD_9_CM3Code> yibaooperationnameGuoLinICD_9_CM3Codes = new HashSet<>();
 
 }

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

@@ -1,10 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoOperationNameGuoLinOperationName;
 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;
@@ -17,6 +17,6 @@ public class GuoLinOperationName extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称相关国临手术和操作名称", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameGuoLinOperationName> yiBaoOperationNameGuoLinOperationNames = new HashSet<>();
 
 }

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

@@ -1,10 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameHerbDeptClass;
 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;
@@ -17,6 +17,6 @@ public class HerbDeptClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameHerbDeptClass> medcodenameHerbDeptClass = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameHerbFangJiCate;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class HerbFangJiCate extends BaseNode  {
 
 
 	@Relationship(type = "药品相关中成药方剂学大类", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameHerbFangJiCate> medCodeNameHerbFangJiCates = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameHerbFangJiClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class HerbFangJiClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关中成药方剂学类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameHerbFangJiClass> medcodenameHerbFangJiClass = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameHerbYiBaoClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class HerbYiBaoClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关中成药医保类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameHerbYiBaoClass> medcodenameHerbYiBaoClass = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameHerbZhiLiaoClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class HerbZhiLiaoClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关中成药治疗学类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameHerbZhiLiaoClass> medcodenameHerbZhiLiaoClass = new HashSet<>();
 
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.CombiOperationLis;
+import com.diagbot.entity.relationship.PacsNameLis;
+import com.diagbot.entity.relationship.YiBaoOperationNameLis;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -29,18 +31,18 @@ public class Lis extends BaseNode  {
 	private Integer range;
 
 	@Relationship(type = "医保手术和操作名称禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameLis> yibaooperationnameLis = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameLis> pacsNameLis = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationLis> combioperationLis = new HashSet<>();
 
 //	@Relationship(type = "辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
 //	private Set<Pacs> pacss = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<YiBaoOperation> yibaooperations = new HashSet<>();
+	private Set<YiBaoOperationNameLis> yibaooperationNameLis = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisAlias;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class LisAlias extends BaseNode  {
 
 
 	@Relationship(type = "实验室检查名称相关实验室检查别名", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameLisAlias> lisnameLisAlias = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class LisCode extends BaseNode  {
 
 
 	@Relationship(type = "实验室检查名称相关实验室检查代码", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameLisCode> lisnameLisCodes = new HashSet<>();
 
 }

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

@@ -1,12 +1,16 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisCritical;
 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.HashSet;
+import java.util.Set;
+
 
 @Setter
 @Getter
@@ -30,7 +34,7 @@ public class LisCritical extends BaseNode  {
     private String range;
 
     @Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.INCOMING)
-    private LisName lisname;
+    private Set<LisNameLisCritical> lisnameLisCriticals = new HashSet<>();
 
 }
 

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisFirstClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class LisFirstClass extends BaseNode  {
 
 
 	@Relationship(type = "实验室检查名称相关实验室检查一级分类", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameLisFirstClass> lisnameLisFirstClass = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -31,30 +32,30 @@ public class LisName extends BaseNode  {
 	private String knowledge;
 
 	@Relationship(type = "实验室检查名称相关实验室检查代码", direction = Relationship.OUTGOING)
-	private Set<LisCode> liscodes = new HashSet<>();
+	private Set<LisNameLisCode> lisNameliscodes = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关实验室检查别名", direction = Relationship.OUTGOING)
-	private Set<LisAlias> lisaliass = new HashSet<>();
+	private Set<LisNameLisAlias> lisNamelisaliass = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关实验室检查一级分类", direction = Relationship.OUTGOING)
-	private Set<LisFirstClass> lisfirstclasss = new HashSet<>();
+	private Set<LisNameLisFirstClass> lisNamelisfirstclasss = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关实验室检查二级分类", direction = Relationship.OUTGOING)
-	private Set<LisSecondClass> lissecondclasss = new HashSet<>();
+	private Set<LisNameLisSecondClass> lisNamelissecondclasss = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.OUTGOING)
-	private Set<LisSet> lissets = new HashSet<>();
+	private Set<LisNameLisSet> lisNamelissets = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<LisNameGroup> lisNamegroups = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private LisNameGender lisNamegender;
 
 	@Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.OUTGOING)
-	private Set<LisCritical> liscritials = new HashSet<>();
+	private Set<LisNameLisCritical> lisNameliscritials = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<LisNameYiBaoDiseaseName> lisNamedisease = new HashSet<>();
 
 }

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

@@ -1,6 +1,8 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisRemindMedicine;
+import com.diagbot.entity.relationship.LisRemindYiBaoDiseaseName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -34,9 +36,9 @@ public class LisRemind extends BaseNode  {
 	private String lisname;
 
 	@Relationship(type = "化验提醒指标相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<LisRemindYiBaoDiseaseName> lisReminddisease = new HashSet<>();
 
 	@Relationship(type = "化验提醒指标相关药品通用名称", direction = Relationship.OUTGOING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<LisRemindMedicine> lisRemindmedicines = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisResultYiBaoDiseaseName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -37,6 +38,6 @@ public class LisResult extends BaseNode  {
 	private Integer minage;
 
 	@Relationship(type = "实验室检查结果相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<LisResultYiBaoDiseaseName> lisResultdisease = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisSecondClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class LisSecondClass extends BaseNode  {
 
 
 	@Relationship(type = "实验室检查名称相关实验室检查二级分类", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameLisSecondClass> lisnameLisSecondClass = new HashSet<>();
 
 }

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

@@ -1,6 +1,9 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.LisNameLisSet;
+import com.diagbot.entity.relationship.LisSetGender;
+import com.diagbot.entity.relationship.LisSetGroup;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -28,12 +31,12 @@ public class LisSet extends BaseNode  {
 	private Integer range;
 
 	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private LisSetGender lisSetgender;
 
 	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<LisSetGroup> lisSetGroups = new HashSet<>();
 
 	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.INCOMING)
-	private Set<LisName> lisnames = new HashSet<>();
+	private Set<LisNameLisSet> lisnamelisSet = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -20,23 +20,23 @@ public class MedAllergen extends BaseNode  {
 	private String medtype;
 
 	@Relationship(type = "辅助检查名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsMedAllergen> pacsMedAllergens = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameMedAllergen> yibaooperationnameMedAllergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+	private Set<PacsNameSubNameMedAllergen> pacsnamesubnameMedAllergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsSubName> pacssubnames = new HashSet<>();
+	private Set<PacsSubNameMedAllergen> pacssubnameMedAllergens = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationMedAllergen> combioperationMedAllergens = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<MedicineMedAllergen> medicineMedAllergens = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<MedRegName> medRegNames = new HashSet<>();
+	private Set<MedRegNameMedAllergen> medRegNameMedAllergens = new HashSet<>();
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedCode extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品代码", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedCode> medcodenameMedCodes = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -44,54 +45,54 @@ public class MedCodeName extends BaseNode  {
 	private String min_prod_unit;
 
 	@Relationship(type = "药品相关药品类别", direction = Relationship.OUTGOING)
-	private Set<MedClass> medclasss = new HashSet<>();
+	private Set<MedCodeNameMedClass> medCodeNameMedclasss = new HashSet<>();
 
 	@Relationship(type = "药品相关药品注册名称", direction = Relationship.OUTGOING)
-	private Set<MedRegName> medregnames = new HashSet<>();
+	private Set<MedCodeNameMedRegName> medCodeNameMedregnames = new HashSet<>();
 
 	@Relationship(type = "药品相关药品通用名称", direction = Relationship.OUTGOING)
-	private Set<Medicine> medicines = new HashSet<>();
+	private Set<MedCodeNameMedicine> medCodeNameMedicines = new HashSet<>();
 
 	@Relationship(type = "药品相关药品化学物质类别", direction = Relationship.OUTGOING)
-	private Set<MedChemClass> medchemclass = new HashSet<>();
+	private Set<MedCodeNameMedChemClass> medCodeNameMedchemclass = new HashSet<>();
 
 	@Relationship(type = "药品相关药品药理学类别", direction = Relationship.OUTGOING)
-	private Set<MedYaoLiClass> medyaoliclass = new HashSet<>();
+	private Set<MedCodeNameMedYaoLiClass> medCodeNameMedyaoliclass = new HashSet<>();
 
 	@Relationship(type = "药品相关药品治疗学类别", direction = Relationship.OUTGOING)
-	private Set<MedZhiLiaoClass> medzhiliaoclass = new HashSet<>();
+	private Set<MedCodeNameMedZhiLiaoClass> medCodeNameMedzhiliaoclass = new HashSet<>();
 
 	@Relationship(type = "药品相关药品解剖学类别", direction = Relationship.OUTGOING)
-	private Set<MedJiePouClass> medjiepouclass = new HashSet<>();
+	private Set<MedCodeNameMedJiePouClass> medCodeNameMedjiepouclass = new HashSet<>();
 
 	@Relationship(type = "药品相关药品代码", direction = Relationship.OUTGOING)
-	private Set<MedCode> medcodes = new HashSet<>();
+	private Set<MedCodeNameMedCode> medCodeNameMedcodes = new HashSet<>();
 
 	@Relationship(type = "药品相关药品商品名称", direction = Relationship.OUTGOING)
-	private Set<MedProdName> medprodnames = new HashSet<>();
+	private Set<MedCodeNameMedProdName> medCodeNameMedprodnames = new HashSet<>();
 
 	@Relationship(type = "药品相关药品医保类别", direction = Relationship.OUTGOING)
-	private Set<MedYiBaoClass> medyibaoclass = new HashSet<>();
+	private Set<MedCodeNameMedYiBaoClass> medCodeNameMedyibaoclass = new HashSet<>();
 
 	@Relationship(type = "药品相关注册名称", direction = Relationship.OUTGOING)
-	private Set<RegName> regnames = new HashSet<>();
+	private Set<MedCodeNameRegName> medCodeNameRegnames = new HashSet<>();
 
 	@Relationship(type = "药品相关中成药方剂学大类", direction = Relationship.OUTGOING)
-	private Set<HerbFangJiCate> herbfangjicates = new HashSet<>();
+	private Set<MedCodeNameHerbFangJiCate> medCodeNameHerbfangjicates = new HashSet<>();
 
 	@Relationship(type = "药品相关中成药方剂学类别", direction = Relationship.OUTGOING)
-	private Set<HerbFangJiClass> herbfangjiclass = new HashSet<>();
+	private Set<MedCodeNameHerbFangJiClass> medCodeNameHerbfangjiclass = new HashSet<>();
 
 	@Relationship(type = "药品相关中成药治疗学类别", direction = Relationship.OUTGOING)
-	private Set<HerbZhiLiaoClass> herbzhiliaoclass = new HashSet<>();
+	private Set<MedCodeNameHerbZhiLiaoClass> medCodeNameHerbzhiliaoclass = new HashSet<>();
 
 	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.OUTGOING)
-	private Set<HerbDeptClass> herbdeptclass = new HashSet<>();
+	private Set<MedCodeNameHerbDeptClass> medCodeNameHerbdeptclass = new HashSet<>();
 
 	@Relationship(type = "药品相关中成药医保类别", direction = Relationship.OUTGOING)
-	private Set<HerbYiBaoClass> herbyibaoclass = new HashSet<>();
+	private Set<MedCodeNameHerbYiBaoClass> medCodeNameHerbyibaoclass = new HashSet<>();
 
 	@Relationship(type = "药品相关商品名称", direction = Relationship.OUTGOING)
-	private Set<ProdName> prodnames = new HashSet<>();
+	private Set<MedCodeNameProdName> medCodeNameProdnames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedJiePouClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedJiePouClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品解剖学类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedJiePouClass> medcodenameMedJiePouClasss = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedProdName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedProdName extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品商品名称", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedProdName> medcodenameMedProdNames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -25,21 +26,21 @@ public class MedRegName extends BaseNode  {
 	private String conflict_geiyao;
 
 	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vital = new HashSet<>();
+	private Set<MedRegNameVital> medRegNameVital = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> group = new HashSet<>();
+	private Set<MedRegNameGroup> medRegNameGroup = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medAllergens = new HashSet<>();
+	private Set<MedRegNameMedAllergen> medRegNameMedAllergens = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌药品注册名称", direction = Relationship.OUTGOING)
-	private Set<MedRegName> medregnames_out = new HashSet<>();
+	private Set<MedRegNameMedRegName> medRegNameMedregnames_out = new HashSet<>();
 
 	@Relationship(type = "药品相关药品注册名称", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedRegName> medcodenameMedRegNames = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌药品注册名称", direction = Relationship.INCOMING)
-	private Set<MedRegName> medregnames_in = new HashSet<>();
+	private Set<MedRegNameMedRegName> medregnameMedRegNames_in = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedYaoLiClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedYaoLiClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品药理学类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedYaoLiClass> medcodenameMedYaoLiClasss = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedYiBaoClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedYiBaoClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品医保类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedYiBaoClass> medcodenameMedYiBaoClasss = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameMedZhiLiaoClass;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class MedZhiLiaoClass extends BaseNode  {
 
 
 	@Relationship(type = "药品相关药品治疗学类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedZhiLiaoClass> medcodenameMedZhiLiaoClasss = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -16,22 +17,22 @@ import java.util.HashSet;
 public class Medicine extends BaseNode  {
 
 	@Relationship(type = "药品相关药品通用名称", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameMedicine> medcodenameMedicines = new HashSet<>();
 
 	@Relationship(type = "化验提醒指标相关药品通用名称", direction = Relationship.INCOMING)
-	private Set<LisRemind> lisreminds = new HashSet<>();
+	private Set<LisRemindMedicine> lisremindMedicines = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> group = new HashSet<>();
+	private Set<MedicineGroup> medicineGroup = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vital = new HashSet<>();
+	private Set<MedicineVital> medicineVital = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> disease = new HashSet<>();
+	private Set<MedicineDisease> medicineDisease = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medAllergens = new HashSet<>();
+	private Set<MedicineMedAllergen> medicineMedAllergens = new HashSet<>();
 
 
 }

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

@@ -1,7 +1,8 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsNameOralMedicine;
+import com.diagbot.entity.relationship.YiBaoOperationNameOralMedicine;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,9 +18,9 @@ public class OralMedicine extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称禁忌服用药品", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameOralMedicine> yibaooperationnameOralMedicines = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌服用药品", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNameOralMedicine> pacsNameOralMedicines = new HashSet<>();
 
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.CombiOperationPacsDescribe;
+import com.diagbot.entity.relationship.PacsNamePacsDescribe;
+import com.diagbot.entity.relationship.YiBaoOperationNamePacsDescribe;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,12 +19,12 @@ public class PacsDescribe extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称禁忌辅助检查名称描述", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNamePacsDescribe> yibaooperationnamePacsDescribes = new HashSet<>();
 
 	@Relationship(type = "联合项目禁忌辅助检查名称描述", direction = Relationship.INCOMING)
-	private Set<CombiOperation> combioperations = new HashSet<>();
+	private Set<CombiOperationPacsDescribe> combioperationPacsDescribes = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌辅助检查名称描述", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNamePacsDescribe> pacsNamePacsDescribes = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -16,48 +17,48 @@ public class PacsName extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称包含辅助检查子项目名称", direction = Relationship.OUTGOING)
-	private Set<PacsSubName> pacssubnames = new HashSet<>();
+	private Set<PacsNamePacsSubName> pacsNamePacssubnames = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private PacsNameGender pacsNameGender;
 
 	@Relationship(type = "辅助检查名称禁忌临床表现", direction = Relationship.OUTGOING)
-	private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
+	private Set<PacsNameClinicalFinding> pacsNameClinicalfindings = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vitals = new HashSet<>();
+	private Set<PacsNameVital> pacsNameVitals = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> lis = new HashSet<>();
+	private Set<PacsNameLis> pacsNameLis = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
-	private Set<PacsDescribe> pacsdescribes = new HashSet<>();
+	private Set<PacsNamePacsDescribe> pacsNamePacsdescribes = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<PacsNameGroup> pacsNameGroups = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌服用药品", direction = Relationship.OUTGOING)
-	private Set<OralMedicine> oralmedicines = new HashSet<>();
+	private Set<PacsNameOralMedicine> pacsNameOralmedicines = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medallergens = new HashSet<>();
+	private Set<PacsNameMedAllergen> pacsNameMedallergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> diseases = new HashSet<>();
+	private Set<PacsNameDisease> pacsNameDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌过敏原", direction = Relationship.OUTGOING)
-	private Set<Allergen> allergens = new HashSet<>();
+	private Set<PacsNameAllergen> pacsNameAllergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称禁忌禁忌医疗器械及物品", direction = Relationship.OUTGOING)
-	private Set<ConflictDevice> conflictdevices = new HashSet<>();
+	private Set<PacsNameConflictDevice> pacsNameConflictdevices = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<PacsNameYiBaoDiseaseName> pacsNameDisease = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称开单互斥辅助检查名称", direction = Relationship.OUTGOING)
-	private Set<PacsName> conflictpacs_out = new HashSet<>();
+	private Set<PacsNamePacsName> conflictPacsName_out = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称开单互斥辅助检查名称", direction = Relationship.INCOMING)
-	private Set<PacsName> conflictpacs_in = new HashSet<>();
+	private Set<PacsNamePacsName> conflictPacsName_in = new HashSet<>();
 
 }

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

@@ -1,6 +1,10 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsNameSubNameDisease;
+import com.diagbot.entity.relationship.PacsNameSubNameGender;
+import com.diagbot.entity.relationship.PacsNameSubNameGroup;
+import com.diagbot.entity.relationship.PacsNameSubNameMedAllergen;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,15 +21,15 @@ public class PacsNameSubName extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌性别", direction = Relationship.OUTGOING)
-	private Set<Gender> genders = new HashSet<>();
+	private PacsNameSubNameGender pacsNameSubNameGender;
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> diseases = new HashSet<>();
+	private Set<PacsNameSubNameDisease> pacsNameSubNameDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medallergens = new HashSet<>();
+	private Set<PacsNameSubNameMedAllergen> pacsNameSubNameMedallergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称子项目名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<PacsNameSubNameGroup> pacsNameSubNameGroups = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.PacsResultYiBaoDiseaseName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -16,7 +17,7 @@ public class PacsResult extends BaseNode  {
 
 
 	@Relationship(type = "辅助检查名称结果相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<PacsResultYiBaoDiseaseName> PacsResultDisease = new HashSet<>();
 
 
 }

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

@@ -2,6 +2,7 @@ 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -16,39 +17,39 @@ import java.util.Set;
 public class PacsSubName extends BaseNode  {
 
 	@Relationship(type = "辅助检查子项目名称禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private PacsSubNameGender pacsSubNameGender;
 
 	@Relationship(type = "辅助检查子项目名称禁忌临床表现", direction = Relationship.OUTGOING)
-	private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
+	private Set<PacsSubNameClinicalFinding> pacsSubNameClinicalfindings = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vitals = new HashSet<>();
+	private Set<PacsSubNameVital> pacsSubNameVitals = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> lis = new HashSet<>();
+	private Set<PacsSubNameLis> pacsSubNameLis = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
-	private Set<PacsDescribe> pacsdescribes = new HashSet<>();
+	private Set<PacsSubNamePacsDescribe> pacsSubNamePacsdescribes = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medallergens = new HashSet<>();
+	private Set<PacsSubNameMedAllergen> pacsSubNameMedallergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<Group> groups = new HashSet<>();
+	private Set<PacsSubNameGroup> pacsSubNameGroups = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌服用药品", direction = Relationship.OUTGOING)
-	private Set<OralMedicine> oralmedicines = new HashSet<>();
+	private Set<PacsSubNameOralMedicine> pacsSubNameOralmedicines = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> diseases = new HashSet<>();
+	private Set<PacsSubNameDisease> pacsSubNameDiseases = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌过敏原", direction = Relationship.OUTGOING)
-	private Set<Allergen> allergens = new HashSet<>();
+	private Set<PacsSubNameAllergen> pacsSubNameAllergens = new HashSet<>();
 
 	@Relationship(type = "辅助检查子项目名称禁忌禁忌医疗器械及物品", direction = Relationship.OUTGOING)
-	private Set<ConflictDevice> conflictdevices = new HashSet<>();
+	private Set<PacsSubNameConflictDevice> pacsSubNameConflictdevices = new HashSet<>();
 
 	@Relationship(type = "辅助检查名称包含辅助检查子项目名称", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsNamePacsSubName> pacsNamePacsSubNames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNamePathwayName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -16,6 +17,6 @@ public class PathwayName extends BaseNode  {
 
 
 	@Relationship(type = "医保疾病名称相关临床路径名称", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> yiBaoDiseaseNames = new HashSet<>();
+	private Set<YiBaoDiseaseNamePathwayName> yiBaoDiseaseNamePathwayNames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameProdName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class ProdName extends BaseNode  {
 
 
 	@Relationship(type = "药品相关商品名称", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameProdName> medcodenameProdNames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.MedCodeNameRegName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class RegName extends BaseNode  {
 
 
 	@Relationship(type = "药品相关注册名称", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
+	private Set<MedCodeNameRegName> medcodenameRegNames = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameSymptom;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -29,7 +30,7 @@ public class Symptom extends BaseNode  {
 	private Integer range;
 
 	@Relationship(type = "医保疾病名称相关症状", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<YiBaoDiseaseNameSymptom> diseaseSymptom = new HashSet<>();
 
 
 }

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

@@ -1,6 +1,8 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.TransfusionSuggestYiBaoDiseaseName;
+import com.diagbot.entity.relationship.TransfusionSuggestYiBaoOperationName;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -37,9 +39,9 @@ public class TransfusionSuggest extends BaseNode  {
     private String transfusion_type;
 
 	@Relationship(type="建议输血提醒相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> diseases = new HashSet<>();
+	private Set<TransfusionSuggestYiBaoDiseaseName> transfusionSuggestDiseases = new HashSet<>();
 
 	@Relationship(type="建议输血提醒相关医保手术和操作名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoOperationName> operations = new HashSet<>();
+	private Set<TransfusionSuggestYiBaoOperationName> transfusionSuggestOperations = new HashSet<>();
 
 }

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

@@ -1,7 +1,7 @@
 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;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -33,15 +33,15 @@ public class Vital extends BaseNode  {
 	private String vitalname;
 
 	@Relationship(type = "辅助检查名称禁忌体征", direction = Relationship.INCOMING)
-	private Set<Pacs> pacss = new HashSet<>();
+	private Set<PacsVital> pacsVitals = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌体征", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameVital> yibaooperationnameVitals = new HashSet<>();
 
 	@Relationship(type = "体征相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+	private Set<VitalYiBaoDiseaseName> vitalDisease = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.INCOMING)
-	private Set<MedRegName> medRegNames = new HashSet<>();
+	private Set<MedRegNameVital> medRegNameVitals = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -21,36 +22,40 @@ public class YiBaoDiseaseName extends BaseNode  {
 	private String age;
 
 	@Relationship(type = "医保疾病名称相关医保ICD-10代码", direction = Relationship.OUTGOING)
-	private Set<YiBaoICD_10Code> yibaoicd_10codes = new HashSet<>();
+	private Set<YiBaoDiseaseNameYiBaoICD_10Code> yiBaoDiseaseNameYibaoicd_10codes = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关国临疾病名称", direction = Relationship.OUTGOING)
-	private Set<GuoLinDiseaseName> guolindiseasenames = new HashSet<>();
+	private Set<YiBaoDiseaseNameGuoLinDiseaseName> yiBaoDiseaseNameGuolindiseasenames = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关国临ICD-10代码", direction = Relationship.OUTGOING)
-	private Set<GuoLinICD_10Code> guolinicd_10codes = new HashSet<>();
+	private Set<YiBaoDiseaseNameGuoLinICD_10Code> yiBaoDiseaseNameGuolinicd_10codes = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关临床路径名称", direction = Relationship.OUTGOING)
-	private Set<PathwayName> pathwaynames = new HashSet<>();
+	private Set<YiBaoDiseaseNamePathwayName> yiBaoDiseaseNamePathwaynames = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关症状", direction = Relationship.OUTGOING)
-	private Set<Symptom> symptoms = new HashSet<>();
+//	private Set<YiBaoDiseaseNameSymptom> yiBaoDiseaseNameSymptoms = new HashSet<>();
+	private Set<Symptom> Symptoms = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vitals = new HashSet<>();
+//	private Set<YiBaoDiseaseNameVital> yiBaoDiseaseNameVitals = new HashSet<>();
+	private Set<Vital> Vitals = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关化验套餐名称", direction = Relationship.OUTGOING)
-	private Set<LisBigName> lisnames = new HashSet<>();
+//	private Set<YiBaoDiseaseNameLisBigName> yiBaoDiseaseNameLisnames = new HashSet<>();
+	private Set<LisBigName> Lisnames = new HashSet<>();
 
 	@Relationship(type = "医保疾病名称相关辅助检查名称", direction = Relationship.OUTGOING)
-	private Set<PacsName> pacsnames = new HashSet<>();
+//	private Set<YiBaoDiseaseNamePacsName> yiBaoDiseaseNamePacsnames = new HashSet<>();
+	private Set<PacsName> Pacsnames = new HashSet<>();
 
 	@Relationship(type = "实验室检查结果相关医保疾病名称", direction = Relationship.INCOMING)
-	private Set<LisResult> lisresults = new HashSet<>();
+	private Set<LisResultYiBaoDiseaseName> lisresultYiBaoDiseaseNames = new HashSet<>();
 
 	@Relationship(type = "化验提醒指标相关医保疾病名称", direction = Relationship.INCOMING)
-	private Set<LisRemind> lisreminds = new HashSet<>();
+	private Set<LisRemindYiBaoDiseaseName> lisremindYiBaoDiseaseNames = new HashSet<>();
 
 	@Relationship(type="建议输血提醒相关医保疾病名称", direction = Relationship.INCOMING)
-	private Set<TransfusionSuggest> tfsuggest = new HashSet<>();
+	private Set<TransfusionSuggestYiBaoDiseaseName> tfsuggestYiBaoDiseaseName = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoDiseaseNameYiBaoICD_10Code;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class YiBaoICD_10Code extends BaseNode  {
 
 
 	@Relationship(type = "医保疾病名称相关医保ICD-10代码", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseName> yibaodiseasenames = new HashSet<>();
+	private Set<YiBaoDiseaseNameYiBaoICD_10Code> yibaodiseasenameYiBaoICD_10Codes = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoOperationNameYiBaoICD_9_CM3Code;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class YiBaoICD_9_CM3Code extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作名称相关医保ICD-9-CM3代码", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameYiBaoICD_9_CM3Code> yibaooperationnameYiBaoICD_9_CM3Codes = new HashSet<>();
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
+import com.diagbot.entity.relationship.YiBaoOperationLis;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
@@ -17,6 +18,6 @@ public class YiBaoOperation extends BaseNode  {
 
 
 	@Relationship(type = "医保手术和操作禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> liss = new HashSet<>();
+	private Set<YiBaoOperationLis> yiBaoOperationLiss = new HashSet<>();
 
 }

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

@@ -1,13 +1,12 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.YiBaoOperationGroup;
+import com.diagbot.entity.relationship.*;
 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;
@@ -28,44 +27,44 @@ public class YiBaoOperationName extends BaseNode  {
 	private String highriskcond;
 
 	@Relationship(type = "医保手术和操作名称相关国临ICD-9-CM3代码", direction = Relationship.OUTGOING)
-	private Set<GuoLinICD_9_CM3Code> guolinicd_9_cm3codes = new HashSet<>();
+	private Set<YiBaoOperationNameGuoLinICD_9_CM3Code> guolinicd_9_cm3codes = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称相关国临手术和操作名称", direction = Relationship.OUTGOING)
-	private Set<GuoLinOperationName> guolinoperationnames = new HashSet<>();
+	private Set<YiBaoOperationNameGuoLinOperationName> guolinoperationnames = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称相关医保ICD-9-CM3代码", direction = Relationship.OUTGOING)
-	private Set<YiBaoICD_9_CM3Code> yibaoicd_9_cm3codes = new HashSet<>();
+	private Set<YiBaoOperationNameYiBaoICD_9_CM3Code> yibaoicd_9_cm3codes = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌性别", direction = Relationship.OUTGOING)
-	private Gender gender;
+	private YiBaoOperationNameGender gender;
 
 	@Relationship(type = "医保手术和操作名称禁忌临床表现", direction = Relationship.OUTGOING)
-	private Set<ClinicalFinding> clinicalFindings = new HashSet<>();
+	private Set<YiBaoOperationNameClinicalFinding> clinicalFindings = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌体征", direction = Relationship.OUTGOING)
-	private Set<Vital> vitals = new HashSet<>();
+	private Set<YiBaoOperationNameVital> vitals = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<Lis> liss = new HashSet<>();
+	private Set<YiBaoOperationNameLis> liss = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌服用药品", direction = Relationship.OUTGOING)
-	private Set<OralMedicine> oralmeds = new HashSet<>();
+	private Set<YiBaoOperationNameOralMedicine> oralmeds = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<Disease> diseases = new HashSet<>();
+	private Set<YiBaoOperationNameDisease> diseases = new HashSet<>();
 
-	@Relationship(type = "医保手术和操作名称禁忌禁忌人群")
-	private Set<YiBaoOperationGroup> groups = new HashSet<>();
+	@Relationship(type = "医保手术和操作名称禁忌禁忌人群", direction = Relationship.OUTGOING)
+	private Set<YiBaoOperationNameGroup> groups = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
-	private Set<PacsDescribe> pacsdescs = new HashSet<>();
+	private Set<YiBaoOperationNamePacsDescribe> pacsdescs = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<MedAllergen> medallergens = new HashSet<>();
+	private Set<YiBaoOperationNameMedAllergen> medallergens = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌禁忌医疗器械及物品", direction = Relationship.OUTGOING)
-	private Set<ConflictDevice> conflictdevices = new HashSet<>();
+	private Set<YiBaoOperationNameConflictDevice> conflictdevices = new HashSet<>();
 
 	@Relationship(type="建议输血提醒相关医保手术和操作名称", direction = Relationship.INCOMING)
-	private Set<TransfusionSuggest> tfsuggest = new HashSet<>();
+	private Set<TransfusionSuggestYiBaoOperationName> tfsuggest = new HashSet<>();
 }

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.Disease;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌疾病")
+public class CombiOperationDisease extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private Disease disease;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.Gender;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌性别")
+public class CombiOperationGender extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private Gender gender;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.Group;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌禁忌人群")
+public class CombiOperationGroup extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private Group group;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.Lis;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌实验室检查")
+public class CombiOperationLis extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private Lis lis;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.MedAllergen;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌药物过敏原")
+public class CombiOperationMedAllergen extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private MedAllergen medAllergen;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.CombiOperation;
+import com.diagbot.entity.node.PacsDescribe;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "联合项目禁忌辅助检查名称描述")
+public class CombiOperationPacsDescribe extends BaseRelation {
+    @StartNode
+    private CombiOperation combiOperation;
+
+    @EndNode
+    private PacsDescribe pacsDescribe;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.Gender;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称禁忌性别")
+public class LisNameGender extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private Gender gender;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.Group;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称禁忌禁忌人群")
+public class LisNameGroup extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private Group group;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisAlias;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查别名")
+public class LisNameLisAlias extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisAlias lisAlias;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisCode;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查代码")
+public class LisNameLisCode extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisCode lisCode;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisCritical;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查危急值")
+public class LisNameLisCritical extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisCritical lisCritical;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisFirstClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查一级分类")
+public class LisNameLisFirstClass extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisFirstClass lisFirstClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisSecondClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查二级分类")
+public class LisNameLisSecondClass extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisSecondClass lisSecondClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.LisSet;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关实验室检查套餐名")
+public class LisNameLisSet extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private LisSet lisSet;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisName;
+import com.diagbot.entity.node.YiBaoDiseaseName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查名称相关医保疾病名称")
+public class LisNameYiBaoDiseaseName extends BaseRelation {
+    @StartNode
+    private LisName lisName;
+
+    @EndNode
+    private YiBaoDiseaseName yiBaoDiseaseName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisRemind;
+import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "化验提醒指标相关药品通用名称")
+public class LisRemindMedicine extends BaseRelation {
+    @StartNode
+    private LisRemind lisRemind;
+
+    @EndNode
+    private Medicine medicine;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisRemind;
+import com.diagbot.entity.node.YiBaoDiseaseName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "化验提醒指标相关医保疾病名称")
+public class LisRemindYiBaoDiseaseName extends BaseRelation {
+    @StartNode
+    private LisRemind lisRemind;
+
+    @EndNode
+    private YiBaoDiseaseName yiBaoDiseaseName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisResult;
+import com.diagbot.entity.node.YiBaoDiseaseName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查结果相关医保疾病名称")
+public class LisResultYiBaoDiseaseName extends BaseRelation {
+    @StartNode
+    private LisResult lisResult;
+
+    @EndNode
+    private YiBaoDiseaseName yiBaoDiseaseName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisSet;
+import com.diagbot.entity.node.Gender;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查套餐名禁忌性别")
+public class LisSetGender extends BaseRelation {
+    @StartNode
+    private LisSet lisSet;
+
+    @EndNode
+    private Gender gender;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.LisSet;
+import com.diagbot.entity.node.Group;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "实验室检查套餐名禁忌禁忌人群")
+public class LisSetGroup extends BaseRelation {
+    @StartNode
+    private LisSet lisSet;
+
+    @EndNode
+    private Group group;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.HerbDeptClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关中成药科室类别")
+public class MedCodeNameHerbDeptClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private HerbDeptClass herbDeptClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.HerbFangJiCate;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关中成药方剂学大类")
+public class MedCodeNameHerbFangJiCate extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private HerbFangJiCate herbFangJiCate;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.HerbFangJiClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关中成药方剂学类别")
+public class MedCodeNameHerbFangJiClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private HerbFangJiClass herbFangJiClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.HerbYiBaoClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关中成药医保类别")
+public class MedCodeNameHerbYiBaoClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private HerbYiBaoClass herbYiBaoClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.HerbZhiLiaoClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关中成药治疗学类别")
+public class MedCodeNameHerbZhiLiaoClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private HerbZhiLiaoClass herbZhiLiaoClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedChemClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品化学物质类别")
+public class MedCodeNameMedChemClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedChemClass medChemClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品类别")
+public class MedCodeNameMedClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedClass medClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedCode;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品代码")
+public class MedCodeNameMedCode extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedCode medCode;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedJiePouClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品解剖学类别")
+public class MedCodeNameMedJiePouClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedJiePouClass medJiePouClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedProdName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品商品名称")
+public class MedCodeNameMedProdName extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedProdName medProdName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品注册名称")
+public class MedCodeNameMedRegName extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedRegName medRegName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedYaoLiClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品药理学类别")
+public class MedCodeNameMedYaoLiClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedYaoLiClass medYaoLiClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedYiBaoClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品医保类别")
+public class MedCodeNameMedYiBaoClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedYiBaoClass medYiBaoClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedZhiLiaoClass;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品治疗学类别")
+public class MedCodeNameMedZhiLiaoClass extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private MedZhiLiaoClass medZhiLiaoClass;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关药品通用名称")
+public class MedCodeNameMedicine extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private Medicine medicine;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.ProdName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关商品名称")
+public class MedCodeNameProdName extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private ProdName prodName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.RegName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品相关注册名称")
+public class MedCodeNameRegName extends BaseRelation {
+    @StartNode
+    private MedCodeName medCodeName;
+
+    @EndNode
+    private RegName regName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.node.Age;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品注册名称禁忌体征")
+public class MedRegNameAge extends BaseRelation {
+    @StartNode
+    private MedRegName medRegName;
+
+    @EndNode
+    private Age age;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.node.Group;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品注册名称禁忌禁忌人群")
+public class MedRegNameGroup extends BaseRelation {
+    @StartNode
+    private MedRegName medRegName;
+
+    @EndNode
+    private Group group;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.node.MedAllergen;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品注册名称禁忌药物过敏原")
+public class MedRegNameMedAllergen extends BaseRelation {
+    @StartNode
+    private MedRegName medRegName;
+
+    @EndNode
+    private MedAllergen medAllergen;
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品注册名称禁忌药品注册名称")
+public class MedRegNameMedRegName extends BaseRelation {
+    @StartNode
+    private MedRegName medRegName;
+
+    @EndNode
+    private MedRegName conflictmedRegName;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.node.Vital;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品注册名称禁忌体征")
+public class MedRegNameVital extends BaseRelation {
+    @StartNode
+    private MedRegName medRegName;
+
+    @EndNode
+    private Vital vital;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.node.Age;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品通用名称禁忌年龄")
+public class MedicineAge extends BaseRelation {
+    @StartNode
+    private Medicine medicine;
+
+    @EndNode
+    private Age age;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.entity.relationship;
+
+import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.node.Disease;
+import com.diagbot.entity.relationship.base.BaseRelation;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.*;
+
+@Getter
+@Setter@RelationshipEntity(type = "药品通用名称禁忌疾病")
+public class MedicineDisease extends BaseRelation {
+    @StartNode
+    private Medicine medicine;
+
+    @EndNode
+    private Disease disease;
+}