Merge branch 'master' into innerDevelop

pom.xml

@@ -194,12 +194,22 @@
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-core</artifactId>
+            <version>3.2.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-http-driver</artifactId>
-            <version>3.2.9</version>
+            <version>3.2.11</version>
         </dependency>
 
+
         <!-- 文件上传相关�?? -->
         <dependency>
             <groupId>commons-beanutils</groupId>

src/main/java/com/diagbot/aggregate/IndicationAggregate.java

@@ -5,11 +5,14 @@ import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.facade.BillFacade;
 import com.diagbot.facade.CriticalFacade;
 import com.diagbot.facade.HighRiskFacade;
+import com.diagbot.facade.OtherTipFacade;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.IndicationPushVO;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,6 +24,7 @@ import java.util.Map;
  * @time: 2019/10/16 13:37
  */
 @Component
+@Slf4j
 public class IndicationAggregate {
 
     @Autowired
@@ -29,6 +33,8 @@ public class IndicationAggregate {
     HighRiskFacade highRiskFacade;
     @Autowired
     CriticalFacade criticalFacade;
+    @Autowired
+    OtherTipFacade otherTipFacade;
 
     @DataProvider("indicationAll")
     public IndicationDTO indicationAll(
@@ -37,7 +43,8 @@ public class IndicationAggregate {
             @InvokeParameter("debug") Map<String, Object> debug,
             @DataConsumer("bill") IndicationDTO billDTO,
             @DataConsumer("highrisk") IndicationDTO highriskDTO,
-            @DataConsumer("critical") IndicationDTO criticalDTO) {
+            @DataConsumer("critical") IndicationDTO criticalDTO,
+            @DataConsumer("otherTip") IndicationDTO otherDTO) {
         IndicationDTO res = new IndicationDTO();
         if (billDTO != null) {
             res.setBillMsgList(billDTO.getBillMsgList());
@@ -51,6 +58,10 @@ public class IndicationAggregate {
             res.setCriticalValList(criticalDTO.getCriticalValList());
             debug.putAll(criticalDTO.getDebug()); // 调试信息
         }
+        if (otherDTO != null) {
+            res.setOtherList(otherDTO.getOtherList());
+            debug.putAll(otherDTO.getDebug()); // 调试信息
+        }
         res.setDebug(debug);
         return res;
     }
@@ -69,8 +80,15 @@ public class IndicationAggregate {
         IndicationDTO res = new IndicationDTO();
         // 开单合理性
         if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("2")) {
-            billFacade.billFac(indicationPushVO, wordCrfDTO, res);
-            CoreUtil.getDebugStr(start, "开单规则耗时", res.getDebug());
+            try {
+                billFacade.billFac(indicationPushVO, wordCrfDTO, res);
+                CoreUtil.getDebugStr(start, "开单规则耗时", res.getDebug());
+            } catch (Exception e) {
+                String errMsg = StringUtil.isNotBlank(indicationPushVO.getIdNum()) ?
+                        "行号【" + indicationPushVO.getIdNum() + "】" : "";
+                log.error("【开单规则出错】" + errMsg, e);
+                CoreUtil.getDebugStr("【开单规则出错】", errMsg + e, res.getDebug());
+            }
             return res;
         }
         return null;
@@ -90,8 +108,13 @@ public class IndicationAggregate {
         IndicationDTO res = new IndicationDTO();
         // 高风险提示
         if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("3")) {
-            highRiskFacade.highRiskFac(indicationPushVO, wordCrfDTO, res);
-            CoreUtil.getDebugStr(start, "高风险提示耗时", res.getDebug());
+            try {
+                highRiskFacade.highRiskFac(indicationPushVO, wordCrfDTO, res);
+                CoreUtil.getDebugStr(start, "高风险提示耗时", res.getDebug());
+            } catch (Exception e) {
+                log.error("【高风险提示出错】", e);
+                CoreUtil.getDebugStr("【高风险提示出错】", e, res.getDebug());
+            }
             return res;
         }
         return null;
@@ -111,9 +134,40 @@ public class IndicationAggregate {
         IndicationDTO res = new IndicationDTO();
         // 危急值提示
         if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("1")) {
-            criticalFacade.criticalFac(indicationPushVO, wordCrfDTO, res);
-            CoreUtil.getDebugStr(start, "危急值提示耗时", res.getDebug());
-            return res;
+            try {
+                criticalFacade.criticalFac(indicationPushVO, wordCrfDTO, res);
+                CoreUtil.getDebugStr(start, "危急值提示耗时", res.getDebug());
+                return res;
+            } catch (Exception e) {
+                log.error("【危急值提示出错】", e);
+                CoreUtil.getDebugStr("【危急值提示出错】", e, res.getDebug());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 其他提示
+     *
+     * @param wordCrfDTO
+     * @param indicationPushVO
+     * @return
+     */
+    @DataProvider("otherTip")
+    public IndicationDTO otherTip(@InvokeParameter("wordCrfDTO") WordCrfDTO wordCrfDTO,
+                                  @InvokeParameter("indicationPushVO") IndicationPushVO indicationPushVO) {
+        long start = System.currentTimeMillis();
+        IndicationDTO res = new IndicationDTO();
+        // 其他提示
+        if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("4")) {
+            try {
+                otherTipFacade.otherTipFac(indicationPushVO, wordCrfDTO, res);
+                CoreUtil.getDebugStr(start, "其他值提示耗时", res.getDebug());
+                return res;
+            } catch (Exception e) {
+                log.error("【其他值提示出错】", e);
+                CoreUtil.getDebugStr("【其他值提示出错】", e, res.getDebug());
+            }
         }
         return null;
     }

src/main/java/com/diagbot/config/CacheDeleteInit.java

@@ -27,9 +27,22 @@ public class CacheDeleteInit implements CommandLineRunner {
     public void run(String... args) throws Exception {
         // 服务启动清除redis缓存
         cacheFacade.clear();
+        cacheFacade.clearLoadCache();
         log.info("CDSS-CORE服务启动清除redis缓存成功！");
-
+        //
         neoFacade.getDrugCache();
         log.info("CDSS-CORE服务启动加载药品缓存成功！");
+
+        neoFacade.getSymptomCache();
+        log.info("CDSS-CORE服务启动加载图谱症状缓存成功！");
+
+        neoFacade.getDisSexCache();
+        log.info("CDSS-CORE服务启动加载图谱疾病对应性别信息缓存成功！");
+
+        neoFacade.getDisAgeCache();
+        log.info("CDSS-CORE服务启动加载图谱疾病对应年龄信息缓存成功！");
+
+        neoFacade.getDisdistributionCache();
+        log.info("CDSS-CORE服务启动加载图谱疾病对应发病率缓存成功！");
     }
 }

src/main/java/com/diagbot/config/OgmConfigure.java

@@ -1,27 +1,22 @@
 package com.diagbot.config;
 
-import org.neo4j.ogm.config.ClasspathConfigurationSource;
-import org.neo4j.ogm.config.ConfigurationSource;
 import org.neo4j.ogm.session.SessionFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.transaction.Neo4jTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-
 /**
  * @Description:
  * @Author: Mark
  * @time: 2020/07/31 14:20
  */
 @Configuration
-@EnableAutoConfiguration
 @EnableNeo4jRepositories(basePackages = "com.diagbot.repository")
 @EnableTransactionManagement
-public class OgmConfigure {
+public class OgmConfigurer {
 
     @Value("${neo4j.data.URI}")
     private String uri;

src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -36,11 +36,11 @@ public class SwaggerConfigurer {
      */
     private List<Parameter> parameter() {
         List<Parameter> params = new ArrayList<>();
-        params.add(new ParameterBuilder().name("Authorization")
-                .description("Authorization Bearer token")
-                .modelRef(new ModelRef("string"))
-                .parameterType("header")
-                .required(false).build());
+//        params.add(new ParameterBuilder().name("Authorization")
+//                .description("Authorization Bearer token")
+//                .modelRef(new ModelRef("string"))
+//                .parameterType("header")
+//                .required(false).build());
         return params;
     }
 

src/main/java/com/diagbot/dto/BillNeoDTO.java

@@ -2,8 +2,6 @@ package com.diagbot.dto;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @description: 开单合理性图谱数据
  * @author: Mark
@@ -26,4 +24,13 @@ public class BillNeoDTO {
 
     // 药品开单合理性项目
     private DrugBillNeoDTO drugBillNeoDTO;
+
+    // 手术和操作开单合理性项目
+    private OperationBillNeoDTO operationBillNeoDTO;
+
+    // 联合项目开单合理性项目
+    private CombiOpBillNeoDTO combiOpBillNeoDTO;
+
+    // 输血开单合理性项目
+    private TransfusionBillNeoDTO transfusionBillNeoDTO;
 }

src/main/java/com/diagbot/dto/BillNeoMaxDTO.java

@@ -63,4 +63,7 @@ public class BillNeoMaxDTO {
     // 体征
     private List<NodeNeoDTO> vitals = new ArrayList<>();
 
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
 }

src/main/java/com/diagbot/dto/Cn2SpellDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/9/22 16:05
+ */
+@Getter
+@Setter
+public class Cn2SpellDTO {
+    private List<Cn2SpellDetailDTO> cn2SpellDetailDTOList = new ArrayList<>();
+}

src/main/java/com/diagbot/dto/Cn2SpellDetailDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/9/22 16:06
+ */
+@Getter
+@Setter
+public class Cn2SpellDetailDTO {
+    //汉字
+    private String cn;
+    //拼音
+    private String spell;
+}

src/main/java/com/diagbot/dto/CombiOpBillNeoDTO.java

@@ -0,0 +1,51 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 联合项目开单合理性图谱数据
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class CombiOpBillNeoDTO {
+    // 禁忌性别
+    private NodeNeoDTO gender;
+
+    // 年龄
+    private NodeNeoDTO ageNeoDTO;
+
+    // 临床表现
+    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
+
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
+    // 服用药品
+    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
+
+    // 禁忌药品过敏源
+    private List<NodeNeoDTO> medallergens = new ArrayList<>();
+
+    // 禁忌实验室检查
+    private List<NodeNeoDTO> lis = new ArrayList<>();
+
+    // 禁忌操作
+    private List<NodeNeoDTO> procedures = new ArrayList<>();
+
+    // 禁忌辅助检查
+    private List<NodeNeoDTO> pacs = new ArrayList<>();
+
+    // 禁忌疾病
+    private List<NodeNeoDTO> disease = new ArrayList<>();
+
+    // 禁用人群
+    private List<NodeNeoDTO> group = new ArrayList<>();
+
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
+}

src/main/java/com/diagbot/dto/CriticalNeoDTO.java

@@ -19,7 +19,7 @@ public class CriticalNeoDTO {
     // 危急值数据
     private NodeNeoDTO critical;
 
-    // 类型，例如：“化验”，“体征”
+    // 类型，例如：“化验”，“辅检”，“体征”
     private String type;
 
 }

src/main/java/com/diagbot/dto/DiseaseInfoDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/9/15 10:07
+ */
+@Getter
+@Setter
+public class DiseaseInfoDTO {
+    /**
+     * 疾病名称
+     */
+    private String name;
+
+    /**
+     * ICD10编码
+     */
+    private String icd10Code;
+}

src/main/java/com/diagbot/dto/DrugBillNeoDTO.java

@@ -47,4 +47,7 @@ public class DrugBillNeoDTO {
 
     // 配伍禁忌
     private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
+
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
 }

src/main/java/com/diagbot/dto/HighRiskNeoDTO.java

@@ -2,6 +2,9 @@ package com.diagbot.dto;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description: 高危图谱数据
  * @author: Mark
@@ -17,9 +20,18 @@ public class HighRiskNeoDTO {
     private String standname;
 
     // 是否高危 - True:是，False:否
-    private Boolean isHighrisk;
+    private Boolean isHighrisk = false;
+
+    // 高危级别
+    private String highLevel;
+
+    // 高危相关因素
+    private List<NodeNeoDTO> factor = new ArrayList<>();
 
     // 类型，“药品”，“手术”
     private String type;
 
+    // 药品剂型
+    private String form;
+
 }

src/main/java/com/diagbot/dto/IndicationDTO.java

@@ -20,6 +20,8 @@ public class IndicationDTO {
     private List<BillMsg> billMsgList = new ArrayList<>();
     // 高危药品、手术
     private List<BillMsg> highRiskList = new ArrayList<>();
+    // 其他提醒
+    private List<BillMsg> otherList = new ArrayList<>();
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();
 }

src/main/java/com/diagbot/dto/LisBillNeoDTO.java

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.node.Age;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -29,7 +28,7 @@ public class LisBillNeoDTO {
     private List<NodeNeoDTO> oralmeds = new ArrayList<>();
 
     // 禁忌过敏药品
-    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
+//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
 
     // 禁忌手术
     private List<NodeNeoDTO> operations = new ArrayList<>();
@@ -46,4 +45,7 @@ public class LisBillNeoDTO {
     // 禁用人群
     private List<NodeNeoDTO> group = new ArrayList<>();
 
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
 }

src/main/java/com/diagbot/dto/NeoEntityDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 图谱实体内容
+ * @author: Mark
+ * @time: 2020/8/27 18:34
+ */
+@Data
+public class NeoEntityDTO {
+
+    // 实体名称
+    private String name;
+
+    // 实体标签
+    private List<String> labels;
+
+    // 实体属性
+    private Map<String, String> property;
+}

src/main/java/com/diagbot/dto/NeoPushDTO.java

@@ -2,6 +2,8 @@ package com.diagbot.dto;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -14,17 +16,19 @@ import java.util.Map;
 public class NeoPushDTO {
     private PushBaseDTO disease;//疾病医保名称
     private PushBaseDTO icd10;//疾病医保版icd-10
-    private List<PushBaseDTO> symptoms;//症状
-    private List<PushBaseDTO> vitals;//体征
-    private List<PushBaseDTO> lis;//实验室检查
-    private List<PushBaseDTO> pacs;//辅助检查
+    private List<PushBaseDTO> symptoms = new ArrayList<>();//症状
+    private List<PushBaseDTO> vitals = new ArrayList<>();//体征
+    private List<PushBaseDTO> lis = new ArrayList<>();//实验室检查
+    private List<PushBaseDTO> pacs = new ArrayList<>();//辅助检查
+    // 鉴别诊断
+    private List<PushBaseDTO> differentialDis;
     /**
      * Map<String,List<NeoPushGeneralDTO>>
      *     operation:[  ]
      *     drug:[  ]
      */
-    private Map<String,List<PushBaseDTO>> treat;//治疗
-    private List<PushBaseDTO> diagnosticBasis;//诊断依据
+    private Map<String,List<PushBaseDTO>> treat = new HashMap<>();//治疗
+    private List<PushBaseDTO> diagnosticBasis = new ArrayList<>();//诊断依据
 
 
 }

src/main/java/com/diagbot/dto/NodeNeoDTO.java

@@ -23,6 +23,9 @@ public class NodeNeoDTO {
     // 名称
     private String name;
 
+    // 类型
+    private String termtype;
+
     // 取值类型(0：正常取区间，1：取两头)
     private Integer valType = 0;
 }

src/main/java/com/diagbot/dto/OperationBillNeoDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 手术和操作开单合理性图谱数据
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class OperationBillNeoDTO {
+    // 禁忌性别
+    private NodeNeoDTO gender;
+
+    // 禁忌年龄
+    private NodeNeoDTO ageNeoDTO;
+
+    // 临床表现
+    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
+
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
+    // 禁忌操作
+    private List<NodeNeoDTO> procedures = new ArrayList<>();
+
+    // 禁忌实验室检查
+    private List<NodeNeoDTO> lis = new ArrayList<>();
+
+    // 禁忌辅助检查
+    private List<NodeNeoDTO> pacs = new ArrayList<>();
+
+    // 禁忌过敏药品
+//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
+
+    // 禁忌服用药品
+    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
+
+    // 禁忌疾病
+    private List<NodeNeoDTO> disease = new ArrayList<>();
+
+    // 禁用人群
+    private List<NodeNeoDTO> group = new ArrayList<>();
+
+    // 配伍禁忌
+    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
+
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
+    // 禁忌药物过敏原
+    private List<NodeNeoDTO> medallegen = new ArrayList<>();
+
+    // 禁忌禁忌医疗器械及物品
+    private List<NodeNeoDTO> meddevice = new ArrayList<>();
+
+}

src/main/java/com/diagbot/dto/OtherTipNeoDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.biz.push.entity.Lis;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 其他提醒数据
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class OtherTipNeoDTO extends Lis {
+
+    // 其他提醒相关因素
+    private List<NodeNeoDTO> factor = new ArrayList<>();
+
+}

src/main/java/com/diagbot/dto/OtherTipPacsNeoDTO.java

@@ -0,0 +1,15 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+/**
+ * @description: 其他提醒数据——辅检
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class OtherTipPacsNeoDTO {
+
+    // 提示语
+    private String msg;
+}

src/main/java/com/diagbot/dto/OtherTipTransfusionNeoDTO.java

@@ -0,0 +1,36 @@
+package com.diagbot.dto;
+
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 其他提醒数据——输注
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class OtherTipTransfusionNeoDTO {
+
+    // 输血名称
+    private String name;
+
+    // 化验
+    private List<Lis> lisList = new ArrayList<>();
+
+    // 辅检
+    private List<Item> pacs = new ArrayList<>();
+
+    // 辅检结果
+    private List<Item> pacsRes = new ArrayList<>();
+
+    // 手术及操作
+    private List<Item> operation = new ArrayList<>();
+
+    // 诊断
+    private List<Item> diag = new ArrayList<>();
+
+}

src/main/java/com/diagbot/dto/PacsBillNeoDTO.java

@@ -48,4 +48,7 @@ public class PacsBillNeoDTO {
     // 禁用人群
     private List<NodeNeoDTO> group = new ArrayList<>();
 
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
 }

src/main/java/com/diagbot/dto/PushDTO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,4 +32,9 @@ public class PushDTO {
     private List<PushBaseDTO> complications = new ArrayList<>();
     //诊断
     private Map<String, List<PushBaseDTO>> dis;
+    //一般治疗
+    private List<TreatDTO> treat = new ArrayList<>();
+
+    // 记录调试信息
+    private Map<String, Object> debug = new LinkedHashMap<>();
 }

src/main/java/com/diagbot/dto/PushPlanDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 检验检查计划出参
+ * @author: gaodm
+ * @time: 2020/8/31 9:39
+ */
+@Getter
+@Setter
+public class PushPlanDTO {
+    private List<PushPlansDTO> pushPlans = new ArrayList<>();
+}

src/main/java/com/diagbot/dto/PushPlanDetailDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 检验检查计划明细
+ * @author: gaodm
+ * @time: 2020/8/31 9:41
+ */
+@Getter
+@Setter
+public class PushPlanDetailDTO {
+    //检查时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date examineDate;
+    //描述
+    private String description;
+    //检验
+    private List<String> lis = new ArrayList<>();
+    //检查
+    private List<String> pacs = new ArrayList<>();
+}

src/main/java/com/diagbot/dto/PushPlansDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.biz.push.entity.Item;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 检验检查计划针对单个项目
+ * @author: gaodm
+ * @time: 2020/8/31 9:49
+ */
+@Getter
+@Setter
+public class PushPlansDTO {
+    private Item item;
+    private List<PushPlanDetailDTO> pushPlanDetails = new ArrayList<>();
+}

src/main/java/com/diagbot/dto/RetrievalDTO.java

@@ -28,7 +28,7 @@ public class RetrievalDTO {
     /**
      * 诊断
      */
-    private List<String> diseaseNames;
+    private List<DiseaseInfoDTO> diseaseNames;
     /**
      * 药品
      */
@@ -41,4 +41,8 @@ public class RetrievalDTO {
      * 科室
      */
     private List<String> deptNames;
+    /**
+     * 输血
+     */
+    private List<String> transfusionNames;
 }

src/main/java/com/diagbot/dto/TransfusionBillNeoDTO.java

@@ -0,0 +1,56 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 输血开单合理性图谱数据
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class TransfusionBillNeoDTO {
+    // 禁忌性别
+    private NodeNeoDTO gender;
+
+    // 禁忌年龄
+    private NodeNeoDTO ageNeoDTO;
+
+    // 临床表现
+    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
+
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
+    // 禁忌操作
+    private List<NodeNeoDTO> procedures = new ArrayList<>();
+
+    // 禁忌实验室检查
+    private List<NodeNeoDTO> lis = new ArrayList<>();
+
+    // 禁忌辅助检查
+    private List<NodeNeoDTO> pacs = new ArrayList<>();
+
+    // 禁忌过敏药品
+//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
+
+    // 禁忌服用药品
+    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
+
+    // 禁忌疾病
+    private List<NodeNeoDTO> disease = new ArrayList<>();
+
+    // 禁用人群
+    private List<NodeNeoDTO> group = new ArrayList<>();
+
+    // 配伍禁忌
+    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
+
+    // 禁用辅助检查描述
+    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
+
+    // 禁用手术和操作
+    private List<NodeNeoDTO> operations = new ArrayList<>();
+}

src/main/java/com/diagbot/dto/TreatDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import com.diagbot.biz.push.entity.Item;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/8/28 16:21
+ */
+@Getter
+@Setter
+public class TreatDTO extends Item {
+    //一般治疗
+    private String generaTreat;
+}

src/main/java/com/diagbot/dto/TreatDetailDTO.java

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/8/28 16:22
+ */
+@Getter
+@Setter
+public class TreatDetailDTO {
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+}

src/main/java/com/diagbot/dto/WordCrfDTO.java

@@ -13,6 +13,8 @@ import com.diagbot.model.label.PastLabel;
 import com.diagbot.model.label.PersonalLabel;
 import com.diagbot.model.label.PresentLabel;
 import com.diagbot.model.label.VitalLabel;
+import com.diagbot.vo.Drug;
+import com.diagbot.vo.ItemExt;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -27,7 +29,7 @@ import java.util.List;
  */
 @Data
 public class WordCrfDTO {
-
+    private Long hospitalId;
     // 年龄
     private Integer age;
     // 性别（1：男，2：女）
@@ -36,6 +38,10 @@ public class WordCrfDTO {
     private List<Lis> lis = new ArrayList<>();
     // 辅检项目和结果
     private List<Pacs> pacs = new ArrayList<>();
+    // 药品
+    private List<Drug> drug = new ArrayList<>();
+    // 手术及操作
+    private List<Item> operation = new ArrayList<>();
     // 主诉
     private ChiefLabel chiefLabel = new ChiefLabel();
     // 现病史
@@ -56,6 +62,16 @@ public class WordCrfDTO {
     private DiagLabel diagLabel = new DiagLabel();
 
     /*******************************************入参数据拷贝开始******************************/
+    /**
+     * 选中诊断
+     */
+    private Item diseaseName;
+    /**
+     * 选中手术
+     */
+    private Item operationName;
+     // 诊断
+    private List<Item> diag = new ArrayList<>();
     // 当前化验开单项
     private List<Lis> lisOrder = new ArrayList<>();
     // 当前辅检开单项
@@ -63,12 +79,15 @@ public class WordCrfDTO {
     // 当前诊断开单项
     private List<Item> diagOrder = new ArrayList<>();
     // 当前药品开单项
-    private List<Item> drugOrder = new ArrayList<>();
+    private List<Drug> drugOrder = new ArrayList<>();
     // 当前手术开单项
     private List<Item> operationOrder = new ArrayList<>();
+    // 当前输血开单项
+    private List<ItemExt> transfusionOrder = new ArrayList<>();
     /*******************************************入参数据拷贝结束******************************/
     // 化验
     // private LisLabel lisLabel;
     // 辅检
     private PacsLabel pacsLabel = new PacsLabel();
+
 }

src/main/java/com/diagbot/entity/FollowupPlanDetail.java

@@ -0,0 +1,186 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术随访计划明细表（标准表）
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-09-18
+ */
+@TableName("tran_followup_plan_detail")
+public class FollowupPlanDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 随访计划id
+     */
+    private Long followUpPlanId;
+
+    /**
+     * 随访时间
+     */
+    private String followUpTime;
+
+    /**
+     * 随访时间间隔月数
+     */
+    private Integer intervalMonth;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 项目类型（1：检验，2：检查）
+     */
+    private Integer itemType;
+
+    /**
+     * 排序
+     */
+    private Integer orderNo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getFollowUpPlanId() {
+        return followUpPlanId;
+    }
+
+    public void setFollowUpPlanId(Long followUpPlanId) {
+        this.followUpPlanId = followUpPlanId;
+    }
+    public String getFollowUpTime() {
+        return followUpTime;
+    }
+
+    public void setFollowUpTime(String followUpTime) {
+        this.followUpTime = followUpTime;
+    }
+    public Integer getIntervalMonth() {
+        return intervalMonth;
+    }
+
+    public void setIntervalMonth(Integer intervalMonth) {
+        this.intervalMonth = intervalMonth;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public Integer getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(Integer itemType) {
+        this.itemType = itemType;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Override
+    public String toString() {
+        return "FollowupPlanDetail{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", followUpPlanId=" + followUpPlanId +
+            ", followUpTime=" + followUpTime +
+            ", intervalMonth=" + intervalMonth +
+            ", itemName=" + itemName +
+            ", itemType=" + itemType +
+            ", orderNo=" + orderNo +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/FollowupPlanDetailHospital.java

@@ -0,0 +1,199 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术随访计划明细表（医院定制表）
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-09-18
+ */
+@TableName("tran_followup_plan_detail_hospital")
+public class FollowupPlanDetailHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 随访计划id
+     */
+    private Long followUpPlanId;
+
+    /**
+     * 随访时间
+     */
+    private String followUpTime;
+
+    /**
+     * 随访时间间隔月数
+     */
+    private Integer intervalMonth;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 项目类型（1：检验，2：检查）
+     */
+    private Integer itemType;
+
+    /**
+     * 排序
+     */
+    private Integer orderNo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public Long getFollowUpPlanId() {
+        return followUpPlanId;
+    }
+
+    public void setFollowUpPlanId(Long followUpPlanId) {
+        this.followUpPlanId = followUpPlanId;
+    }
+    public String getFollowUpTime() {
+        return followUpTime;
+    }
+
+    public void setFollowUpTime(String followUpTime) {
+        this.followUpTime = followUpTime;
+    }
+    public Integer getIntervalMonth() {
+        return intervalMonth;
+    }
+
+    public void setIntervalMonth(Integer intervalMonth) {
+        this.intervalMonth = intervalMonth;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public Integer getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(Integer itemType) {
+        this.itemType = itemType;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Override
+    public String toString() {
+        return "FollowupPlanDetailHospital{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", followUpPlanId=" + followUpPlanId +
+            ", followUpTime=" + followUpTime +
+            ", intervalMonth=" + intervalMonth +
+            ", itemName=" + itemName +
+            ", itemType=" + itemType +
+            ", orderNo=" + orderNo +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/FollowupPlanInfo.java

@@ -0,0 +1,121 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术随访计划表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-09-18
+ */
+@TableName("tran_followup_plan_info")
+public class FollowupPlanInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 手术名称
+     */
+    private String operationName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
+    @Override
+    public String toString() {
+        return "FollowupPlanInfo{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", operationName=" + operationName +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/LisConfig.java

@@ -0,0 +1,183 @@
+package com.diagbot.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 化验公表映射
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-07-28
+ */
+@Data
+@TableName("tran_lis_config")
+public class LisConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * his大项名称
+     */
+    @Excel(name = "his大项名称", width = 40)
+    @NotBlank(message = "请输入大项名称")
+    private String hisName;
+
+    /**
+     * his小项名称
+     */
+    @Excel(name = "his小项名称", width = 40)
+    private String hisDetailName;
+
+    /**
+     * 标准名
+     */
+    @Excel(name = "标准名", width = 40)
+    @NotBlank(message = "请输入公表名称")
+    private String uniqueName;
+
+    /**
+     * 标准编码
+     */
+    @Excel(name = "标准编码", width = 40)
+    private String uniqueCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getHisName() {
+        return hisName;
+    }
+
+    public void setHisName(String hisName) {
+        this.hisName = hisName;
+    }
+    public String getHisDetailName() {
+        return hisDetailName;
+    }
+
+    public void setHisDetailName(String hisDetailName) {
+        this.hisDetailName = hisDetailName;
+    }
+    public String getUniqueName() {
+        return uniqueName;
+    }
+
+    public void setUniqueName(String uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+    public String getUniqueCode() {
+        return uniqueCode;
+    }
+
+    public void setUniqueCode(String uniqueCode) {
+        this.uniqueCode = uniqueCode;
+    }
+
+    @Override
+    public String toString() {
+        return "LisConfig{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", hisName=" + hisName +
+            ", hisDetailName=" + hisDetailName +
+            ", uniqueName=" + uniqueName +
+            ", uniqueCode=" + uniqueCode +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/PacsConfig.java

@@ -0,0 +1,164 @@
+package com.diagbot.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查公表映射
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-07-28
+ */
+@TableName("tran_pacs_config")
+public class PacsConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * his名称
+     */
+    @Excel(name="HIS名称", width = 40)
+    private String hisName;
+
+    /**
+     * 标准名
+     */
+    @Excel(name = "标准名称", width = 40)
+    private String uniqueName;
+
+    /**
+     * 标准编码
+     */
+    @Excel(name="标准编码", width = 40)
+    private String uniqueCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getHisName() {
+        return hisName;
+    }
+
+    public void setHisName(String hisName) {
+        this.hisName = hisName;
+    }
+    public String getUniqueName() {
+        return uniqueName;
+    }
+
+    public void setUniqueName(String uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+    public String getUniqueCode() {
+        return uniqueCode;
+    }
+
+    public void setUniqueCode(String uniqueCode) {
+        this.uniqueCode = uniqueCode;
+    }
+
+    @Override
+    public String toString() {
+        return "PacsConfig{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", hisName=" + hisName +
+            ", uniqueName=" + uniqueName +
+            ", uniqueCode=" + uniqueCode +
+        "}";
+    }
+}

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

@@ -1,40 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "年龄")
-public class Age extends BaseNode  {
-
-    @Property(name = "最大值")
-    private Integer maxval;
-
-    @Property(name = "最小值")
-    private Integer minval;
-
-    @Relationship(type="疾病相关年龄", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-
-    @Relationship(type="药品通用名禁忌年龄", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-
-    @Relationship(type = "辅助检查禁忌年龄", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
-
-    @Relationship(type="实验室检查禁忌年龄", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
-}
-

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "别名")
-public class Alias extends BaseNode  {
-
-    @Relationship(type="疾病相关别名", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

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

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

@@ -1,29 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "过敏药品")
-public class AllergicMed extends BaseNode  {
-
-    @Relationship(type="药品通用名禁忌过敏药品", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-
-    @Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
-
-    @Relationship(type="实验室检查禁忌过敏药品", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
-}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "发病原因")
-public class Cause extends BaseNode  {
-
-    @Relationship(type="疾病相关发病原因", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,40 +1,37 @@
 package com.diagbot.entity.node;
 
-import lombok.Data;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 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.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-//@EqualsAndHashCode(callSuper = true)
 @NodeEntity(label = "临床表现")
 public class ClinicalFinding extends BaseNode  {
 
-    @Property(name = "最大值")
-    private Double maxval;
+	@Property(name = "单位")
+	private String unit;
 
-    @Property(name = "最小值")
-    private Double minval;
+	@Property(name = "最小值")
+	private Double minval;
 
-    @Property(name = "单位")
-    private String unit;
+	@Property(name = "最大值")
+	private Double maxval;
 
-    @Relationship(type="药品通用名禁忌临床表现", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+	@Property(name = "范围")
+	private Integer range;
 
-    @Relationship(type="辅助检查禁忌临床表现", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+	@Relationship(type = "辅助检查名称禁忌临床表现", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
 
-    @Relationship(type="实验室检查禁忌临床表现", direction = Relationship.INCOMING)
-    private Set<ClinicalFinding> clinicalfindings;
+	@Relationship(type = "医保手术和操作名称禁忌临床表现", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
 
-}
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "编码")
-public class Code extends BaseNode  {
-
-    @Relationship(type="疾病相关编码", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -0,0 +1,40 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "联合项目")
+public class CombiOperation extends BaseNode  {
+
+
+	@Property(name = "联合操作")
+	private String combi_name;
+
+	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.OUTGOING)
+	private Set<Lis> liss = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
+	private Set<PacsDescribe> pacsdescs = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.OUTGOING)
+	private Set<Disease> diseases = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.OUTGOING)
+	private Set<Group> groups = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.OUTGOING)
+	private Set<MedAllergen> medallergens = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌性别", direction = Relationship.OUTGOING)
+	private Gender gender;
+
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "并发症")
-public class Complication extends BaseNode  {
-
-    @Relationship(type="疾病相关并发症", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

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

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

@@ -1,23 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "配伍")
-public class ConflictMed extends BaseNode  {
-
-    @Relationship(type="药品通用名禁忌配伍", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "治愈率")
-public class CureRate extends BaseNode  {
-
-    @Relationship(type="疾病相关治愈率", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,19 +1,22 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-//@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "科室")
 public class Dept extends BaseNode  {
 
-    @Relationship(type="疾病相关科室", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}
+
+	@Relationship(type = "医保疾病名称相关科室", direction = Relationship.INCOMING)
+	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+
+}

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

@@ -1,123 +1,34 @@
 package com.diagbot.entity.node;
 
-import lombok.Data;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-//@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "疾病")
 public class Disease extends BaseNode  {
 
-    @Relationship(type="疾病相关年龄", direction = Relationship.OUTGOING)
-    private Age age;
-
-    @Relationship(type="疾病相关性别", direction = Relationship.OUTGOING)
-    private Gender gender;
-
-    @Relationship(type="疾病相关治愈率", direction = Relationship.OUTGOING)
-    private CureRate curerate;
-
-    @Relationship(type="疾病相关治疗周期", direction = Relationship.OUTGOING)
-    private TreatCycle treatcycle;
-
-    @Relationship(type="疾病相关传染途径", direction = Relationship.OUTGOING)
-    private Set<Infection> infections = new HashSet<>();
-
-    @Relationship(type="疾病相关多发人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups = new HashSet<>();
-
-    @Relationship(type="疾病相关别名", direction = Relationship.OUTGOING)
-    private Set<Alias> alias = new HashSet<>();
-
-    @Relationship(type="疾病相关体征", direction = Relationship.OUTGOING)
-    private Set<Vital> vitals = new HashSet<>();
-
-    @Relationship(type="疾病相关科室", direction = Relationship.OUTGOING)
-    private Set<Dept> depts = new HashSet<>();
-
-    @Relationship(type="疾病相关症状", direction = Relationship.OUTGOING)
-    private Set<Symptom> symptoms = new HashSet<>();
-
-    @Relationship(type="疾病相关发病情况", direction = Relationship.OUTGOING)
-    private Set<Situation> situations = new HashSet<>();
-
-    @Relationship(type="疾病相关编码", direction = Relationship.OUTGOING)
-    private Code code;
-
-    @Relationship(type="疾病相关标准科室", direction = Relationship.OUTGOING)
-    private Set<Dept> stddepts = new HashSet<>();
-
-    @Relationship(type="疾病相关并发症", direction = Relationship.OUTGOING)
-    private Set<Complication> complications = new HashSet<>();
-
-    @Relationship(type="疾病相关检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacss = new HashSet<>();
-
-    @Relationship(type="疾病相关药品", direction = Relationship.OUTGOING)
-    private Set<Medicine> medicines = new HashSet<>();
-
-    @Relationship(type="疾病相关发病原因", direction = Relationship.OUTGOING)
-    private Set<Cause> causes = new HashSet<>();
-
-    @Relationship(type="疾病相关鉴别诊断", direction = Relationship.OUTGOING)
-    private Set<Disease> diff_diseases = new HashSet<>();
-
-    @Relationship(type="疾病相关手术和操作", direction = Relationship.OUTGOING)
-    private Set<Operation> operations = new HashSet<>();
-
-    @Relationship(type="疾病相关病原体", direction = Relationship.OUTGOING)
-    private Set<Pathogen> pathogens = new HashSet<>();
-
-    @Relationship(type="疾病相关遗传性", direction = Relationship.OUTGOING)
-    private Set<Heredity> hereditys = new HashSet<>();
-
-    @Relationship(type="疾病相关治疗", direction = Relationship.OUTGOING)
-    private Set<Treatment> treatments = new HashSet<>();
-
-    @Relationship(type="疾病相关分型", direction = Relationship.OUTGOING)
-    private Set<DiseaseType> diseasetypes = new HashSet<>();
-
-    @Relationship(type="疾病相关局部并发症", direction = Relationship.OUTGOING)
-    private Set<Complication> localcompls = new HashSet<>();
-
-    @Relationship(type="疾病相关全身并发症", direction = Relationship.OUTGOING)
-    private Set<Complication> generalcompls = new HashSet<>();
-
-    @Relationship(type="疾病相关化验", direction = Relationship.OUTGOING)
-    private Set<LIS> liss = new HashSet<>();
-
-    @Relationship(type="疾病相关实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> liss_dis = new HashSet<>();
-
-    @Relationship(type="疾病相关辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacs = new HashSet<>();
-
-    @Relationship(type="疾病相关药品名及编码", direction = Relationship.OUTGOING)
-    private Medicine_Code medicine_code;
-
-    @Relationship(type="药品通用名禁忌疾病", direction = Relationship.INCOMING)
-    private Set<Medicine> medicine_conflict_diseases;
-
-    @Relationship(type="辅助检查禁忌疾病", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_diseases;
-
-    @Relationship(type="实验室检查禁忌疾病", direction = Relationship.INCOMING)
-    private Set<Disease> lis_conflict_diseases;
-}
 
+	@Relationship(type = "医保手术和操作名称禁忌疾病", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
 
+	@Relationship(type = "辅助检查名称禁忌疾病", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
 
+	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.INCOMING)
+	private Set<CombiOperation> combioperations = new HashSet<>();
 
+	@Relationship(type = "辅助检查名称子项目名称禁忌疾病", direction = Relationship.INCOMING)
+	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
 
+	@Relationship(type = "辅助检查子项目名称禁忌疾病", direction = Relationship.INCOMING)
+	private Set<PacsSubName> pacssubnames = new HashSet<>();
 
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "分型")
-public class DiseaseType extends BaseNode  {
-
-    @Relationship(type="疾病相关分型", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,32 +1,37 @@
 package com.diagbot.entity.node;
 
-import lombok.Data;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-//@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "性别")
 public class Gender extends BaseNode  {
 
-    @Relationship(type="疾病相关性别", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
 
-    @Relationship(type="药品通用名禁忌性别", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+	@Relationship(type = "辅助检查名称禁忌性别", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
 
-    @Relationship(type = "辅助检查禁忌性别", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.INCOMING)
+	private Set<LisSet> lissets = new HashSet<>();
 
-    @Relationship(type="实验室检查禁忌性别", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
-}
+	@Relationship(type = "医保手术和操作名称禁忌性别", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+
+	@Relationship(type = "辅助检查名称子项目名称禁忌性别", direction = Relationship.INCOMING)
+	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌性别", direction = Relationship.INCOMING)
+	private Set<CombiOperation> combioperations = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "全身并发症")
-public class GeneralCompl extends BaseNode  {
-
-    @Relationship(type="疾病相关全身并发症", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,32 +1,37 @@
 package com.diagbot.entity.node;
 
-import lombok.Data;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "人群")
+@NodeEntity(label = "禁忌人群")
 public class Group extends BaseNode  {
 
-    @Relationship(type="疾病相关多发人群", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
 
-    @Relationship(type="药品通用名禁忌人群", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
 
-    @Relationship(type="辅助检查禁忌人群", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+	@Relationship(type = "医保手术和操作名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
 
-    @Relationship(type="实验室检查禁忌人群", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
-}
+	@Relationship(type = "辅助检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<CombiOperation> combioperations = new HashSet<>();
+
+	@Relationship(type = "辅助检查名称子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+
+	@Relationship(type = "辅助检查子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<PacsSubName> pacssubnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "国临疾病名称")
+public class GuoLinDiseaseName extends BaseNode  {
+
+
+	@Relationship(type = "医保疾病名称相关国临疾病名称", direction = Relationship.INCOMING)
+	private Set<YiBaoDiseaseName> yibaodiseasenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "国临ICD_10代码")
+public class GuoLinICD_10Code extends BaseNode  {
+
+
+	@Relationship(type = "医保疾病名称相关国临ICD-10代码", direction = Relationship.INCOMING)
+	private Set<YiBaoDiseaseName> yibaodiseasenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "国临ICD_9_CM3代码")
+public class GuoLinICD_9_CM3Code extends BaseNode  {
+
+
+	@Relationship(type = "医保手术和操作名称相关国临ICD-9-CM3代码", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "国临手术和操作名称")
+public class GuoLinOperationName extends BaseNode  {
+
+
+	@Relationship(type = "医保手术和操作名称相关国临手术和操作名称", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "中成药科室类别")
+public class HerbDeptClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "中成药方剂学大类")
+public class HerbFangJiCate extends BaseNode  {
+
+
+	@Relationship(type = "药品相关中成药方剂学大类", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "中成药方剂学类别")
+public class HerbFangJiClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关中成药方剂学类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "中成药医保类别")
+public class HerbYiBaoClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关中成药医保类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "中成药治疗学类别")
+public class HerbZhiLiaoClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关中成药治疗学类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "遗传性")
-public class Heredity extends BaseNode  {
-
-    @Relationship(type="疾病相关遗传性", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,40 +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.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "医保ICD-10疾病")
-public class ICDDisease extends BaseNode  {
-
-    @Property(name="医保ICD-10代码")
-    private String icdcode;
-
-    @Property(name="疾病名称")
-    private String othername;
-
-    @Relationship(type="医保ICD-10疾病相关实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> liss_dis = new HashSet<>();
-
-    @Relationship(type="医保ICD-10疾病相关辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacs = new HashSet<>();
-
-    @Relationship(type="医保ICD-10疾病相关实验室检查套餐", direction = Relationship.OUTGOING)
-    private Set<LISPack> lispack_dis = new HashSet<>();
-
-}
-
-
-
-
-
-

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "传染途径")
-public class Infection extends BaseNode  {
-
-    @Relationship(type="疾病相关传染途径", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -1,90 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "实验室检查")
-public class LIS extends BaseNode  {
-
-    @Property(name = "最大值")
-    private Double maxval;
-
-    @Property(name = "最小值")
-    private Double minval;
-
-    @Property(name = "单位")
-    private String unit;
-
-    @Relationship(type="实验室检查项目相关套餐", direction = Relationship.OUTGOING)
-    private Set<LISPack> lisPacks = new HashSet<>();
-
-    @Relationship(type="实验室检查相关实验室检查危急值", direction = Relationship.OUTGOING)
-    private Set<LISCritical> liscritial = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌性别", direction = Relationship.OUTGOING)
-    private Gender gender;
-
-    @Relationship(type="实验室检查禁忌年龄", direction = Relationship.OUTGOING)
-    private Age age;
-
-    @Relationship(type="实验室检查禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌体征", direction = Relationship.OUTGOING)
-    private Set<Vital> vitals = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.OUTGOING)
-    private Set<Medicine> conflict_medicines = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌过敏药品", direction = Relationship.OUTGOING)
-    private Set<AllergicMed> allergicmeds = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌手术和操作", direction = Relationship.OUTGOING)
-    private Set<Operation> operations = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌操作", direction = Relationship.OUTGOING)
-    private Set<Procedure> procedures = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacs = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> diseases = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups = new HashSet<>();
-
-    @Relationship(type="疾病相关化验", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_inspect;
-
-    @Relationship(type="疾病相关实验室检查", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_lis;
-
-    @Relationship(type="药品通用名禁忌实验室检查", direction = Relationship.INCOMING)
-    private Set<Medicine> medicine_conflict_lis;
-
-    @Relationship(type="辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_lis;
-
-    @Relationship(type="医保ICD-10疾病相关实验室检查", direction = Relationship.INCOMING)
-    private Set<Disease> icddis_related_lis = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐相关实验室检查", direction = Relationship.INCOMING)
-    private Set<LISPack> lisPacks_related_lis = new HashSet<>();
-}
-
-

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

@@ -1,81 +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.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "实验室检查套餐")
-public class LISPack extends BaseNode  {
-
-    @Property(name = "最大值")
-    private String maxval;
-
-    @Property(name = "最小值")
-    private String minval;
-
-    @Property(name = "单位")
-    private String unit;
-
-    @Relationship(type="实验室检查套餐相关实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> lisPacks_related_lis = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌性别", direction = Relationship.OUTGOING)
-    private Gender gender;
-
-    @Relationship(type="实验室检查套餐禁忌年龄", direction = Relationship.OUTGOING)
-    private Age age;
-
-    @Relationship(type="实验室检查套餐禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌服用药品", direction = Relationship.OUTGOING)
-    private Set<Medicine> conflict_medicines = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌过敏药品", direction = Relationship.OUTGOING)
-    private Set<AllergicMed> allergicmeds = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌手术和操作", direction = Relationship.OUTGOING)
-    private Set<Operation> operations = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌操作", direction = Relationship.OUTGOING)
-    private Set<Procedure> procedures = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacs = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> diseases = new HashSet<>();
-
-    @Relationship(type="实验室检查套餐禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups = new HashSet<>();
-
-    @Relationship(type="疾病相关化验套餐", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_inspect;
-
-    @Relationship(type="疾病相关实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_lispack;
-
-    @Relationship(type="药品通用名禁忌实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<Medicine> medicine_conflict_lispack;
-
-    @Relationship(type="辅助检查禁忌实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_lispack;
-
-    @Relationship(type="医保ICD-10疾病相关实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<Disease> icddis_related_lispack = new HashSet<>();
-
-    @Relationship(type="实验室检查项目相关套餐", direction = Relationship.INCOMING)
-    private Set<LIS> lis_related_lisPack = new HashSet<>();
-
-}
-
-

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

@@ -0,0 +1,46 @@
+package com.diagbot.entity.node;
+
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.entity.node.base.BaseNode;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查")
+public class Lis extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Relationship(type = "医保手术和操作名称禁忌实验室检查", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+
+	@Relationship(type = "辅助检查名称禁忌实验室检查", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.INCOMING)
+	private Set<CombiOperation> combioperations = new HashSet<>();
+
+//	@Relationship(type = "辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
+//	private Set<Pacs> pacss = new HashSet<>();
+
+	@Relationship(type = "医保手术和操作禁忌实验室检查", direction = Relationship.INCOMING)
+	private Set<YiBaoOperation> yibaooperations = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查别名")
+public class LisAlias extends BaseNode  {
+
+
+	@Relationship(type = "实验室检查名称相关实验室检查别名", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查代码")
+public class LisCode extends BaseNode  {
+
+
+	@Relationship(type = "实验室检查名称相关实验室检查代码", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -12,7 +12,7 @@ import org.neo4j.ogm.annotation.Relationship;
 @Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "实验室检查危急值")
-public class LISCritical extends BaseNode  {
+public class LisCritical extends BaseNode  {
 
     @Property(name = "高危急值")
     private String maxval;
@@ -29,8 +29,8 @@ public class LISCritical extends BaseNode  {
     @Property(name = "危急值范围")
     private String range;
 
-    @Relationship(type="实验室检查相关实验室检查危急值", direction = Relationship.INCOMING)
-    private LIS lis_related_liscritial;
+    @Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.INCOMING)
+    private LisName lisname;
 
 }
 

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查一级分类")
+public class LisFirstClass extends BaseNode  {
+
+
+	@Relationship(type = "实验室检查名称相关实验室检查一级分类", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,60 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查名称")
+public class LisName extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Property(name = "静态知识")
+	private String knowledge;
+
+	@Relationship(type = "实验室检查名称相关实验室检查代码", direction = Relationship.OUTGOING)
+	private Set<LisCode> liscodes = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称相关实验室检查别名", direction = Relationship.OUTGOING)
+	private Set<LisAlias> lisaliass = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称相关实验室检查一级分类", direction = Relationship.OUTGOING)
+	private Set<LisFirstClass> lisfirstclasss = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称相关实验室检查二级分类", direction = Relationship.OUTGOING)
+	private Set<LisSecondClass> lissecondclasss = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.OUTGOING)
+	private Set<LisSet> lissets = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.OUTGOING)
+	private Set<Group> groups = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.OUTGOING)
+	private Gender gender;
+
+	@Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.OUTGOING)
+	private Set<LisCritical> liscritials = new HashSet<>();
+
+	@Relationship(type = "实验室检查名称相关医保疾病名称", direction = Relationship.OUTGOING)
+	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+
+}

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

@@ -0,0 +1,42 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "化验提醒指标")
+public class LisRemind extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range=0;
+
+	@Property(name = "结果")
+    private String result;
+
+	@Property(name = "实验室检查名称")
+	private String lisname;
+
+	@Relationship(type = "化验提醒指标相关医保疾病名称", direction = Relationship.OUTGOING)
+	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+
+	@Relationship(type = "化验提醒指标相关药品通用名称", direction = Relationship.OUTGOING)
+	private Set<Medicine> medicines = new HashSet<>();
+
+}

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

@@ -0,0 +1,42 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查结果")
+public class LisResult extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Property(name = "性别")
+	private String gender;
+
+	@Property(name = "年龄最大值")
+	private Integer maxage;
+
+	@Property(name = "年龄最小值")
+	private Integer minage;
+
+	@Relationship(type = "实验室检查结果相关医保疾病名称", direction = Relationship.OUTGOING)
+	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查二级分类")
+public class LisSecondClass extends BaseNode  {
+
+
+	@Relationship(type = "实验室检查名称相关实验室检查二级分类", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,36 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查套餐名")
+public class LisSet extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.OUTGOING)
+	private Gender gender;
+
+	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.INCOMING)
+	private Set<LisName> lisnames = new HashSet<>();
+
+}

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

@@ -1,19 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "局部并发症")
-public class LocalCompl extends BaseNode  {
-
-    @Relationship(type="疾病相关局部并发症", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-}

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

@@ -0,0 +1,34 @@
+package com.diagbot.entity.node;
+
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.entity.node.base.BaseNode;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "药物过敏原")
+public class MedAllergen extends BaseNode  {
+
+
+	@Relationship(type = "辅助检查名称禁忌药物过敏原", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
+
+	@Relationship(type = "医保手术和操作名称禁忌药物过敏原", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
+
+	@Relationship(type = "辅助检查名称子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
+	private Set<PacsNameSubName> pacsnamesubnames = new HashSet<>();
+
+	@Relationship(type = "辅助检查子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
+	private Set<PacsSubName> pacssubnames = new HashSet<>();
+
+	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.INCOMING)
+	private Set<CombiOperation> combioperations = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品化学物质类别")
+public class MedChemClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品化学物质类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品类别")
+public class MedClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品代码")
+public class MedCode extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品代码", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,97 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品代码通用名")
+public class MedCodeName extends BaseNode  {
+
+
+	@Property(name = "最小包装数量")
+	private Double min_pack_num;
+
+	@Property(name = "注册剂型")
+	private String reg_JiXin;
+
+	@Property(name = "药品本位码")
+	private String BenWei_Code;
+
+	@Property(name = "最小包装单位")
+	private String min_pack_unit;
+
+	@Property(name = "注册规格")
+	private String reg_GuiGe;
+
+	@Property(name = "包装材质")
+	private String pack_CaiLiao;
+
+	@Property(name = "药品企业")
+	private String producer;
+
+	@Property(name = "批准文号")
+	private String license_num ;
+
+	@Property(name = "最小制剂单位")
+	private String min_prod_unit;
+
+	@Relationship(type = "药品相关药品类别", direction = Relationship.OUTGOING)
+	private Set<MedClass> medclasss = new HashSet<>();
+
+	@Relationship(type = "药品相关药品注册名称", direction = Relationship.OUTGOING)
+	private Set<MedRegName> medregnames = new HashSet<>();
+
+	@Relationship(type = "药品相关药品通用名称", direction = Relationship.OUTGOING)
+	private Set<Medicine> medicines = new HashSet<>();
+
+	@Relationship(type = "药品相关药品化学物质类别", direction = Relationship.OUTGOING)
+	private Set<MedChemClass> medchemclass = new HashSet<>();
+
+	@Relationship(type = "药品相关药品药理学类别", direction = Relationship.OUTGOING)
+	private Set<MedYaoLiClass> medyaoliclass = new HashSet<>();
+
+	@Relationship(type = "药品相关药品治疗学类别", direction = Relationship.OUTGOING)
+	private Set<MedZhiLiaoClass> medzhiliaoclass = new HashSet<>();
+
+	@Relationship(type = "药品相关药品解剖学类别", direction = Relationship.OUTGOING)
+	private Set<MedJiePouClass> medjiepouclass = new HashSet<>();
+
+	@Relationship(type = "药品相关药品代码", direction = Relationship.OUTGOING)
+	private Set<MedCode> medcodes = new HashSet<>();
+
+	@Relationship(type = "药品相关药品商品名称", direction = Relationship.OUTGOING)
+	private Set<MedProdName> medprodnames = new HashSet<>();
+
+	@Relationship(type = "药品相关药品医保类别", direction = Relationship.OUTGOING)
+	private Set<MedYiBaoClass> medyibaoclass = new HashSet<>();
+
+	@Relationship(type = "药品相关注册名称", direction = Relationship.OUTGOING)
+	private Set<RegName> regnames = new HashSet<>();
+
+	@Relationship(type = "药品相关中成药方剂学大类", direction = Relationship.OUTGOING)
+	private Set<HerbFangJiCate> herbfangjicates = new HashSet<>();
+
+	@Relationship(type = "药品相关中成药方剂学类别", direction = Relationship.OUTGOING)
+	private Set<HerbFangJiClass> herbfangjiclass = new HashSet<>();
+
+	@Relationship(type = "药品相关中成药治疗学类别", direction = Relationship.OUTGOING)
+	private Set<HerbZhiLiaoClass> herbzhiliaoclass = new HashSet<>();
+
+	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.OUTGOING)
+	private Set<HerbDeptClass> herbdeptclass = new HashSet<>();
+
+	@Relationship(type = "药品相关中成药医保类别", direction = Relationship.OUTGOING)
+	private Set<HerbYiBaoClass> herbyibaoclass = new HashSet<>();
+
+	@Relationship(type = "药品相关商品名称", direction = Relationship.OUTGOING)
+	private Set<ProdName> prodnames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品解剖学类别")
+public class MedJiePouClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品解剖学类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品商品名称")
+public class MedProdName extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品商品名称", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,24 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品注册名称")
+public class MedRegName extends BaseNode  {
+
+	@Property(name = "药品高危级别")
+	private String risklevel;
+
+	@Relationship(type = "药品相关药品注册名称", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品药理学类别")
+public class MedYaoLiClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品药理学类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品医保类别")
+public class MedYiBaoClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品医保类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -0,0 +1,22 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Set;
+import java.util.HashSet;
+
+@Setter
+@Getter
+@NodeEntity(label = "药品治疗学类别")
+public class MedZhiLiaoClass extends BaseNode  {
+
+
+	@Relationship(type = "药品相关药品治疗学类别", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
+
+}

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

@@ -1,71 +1,25 @@
 package com.diagbot.entity.node;
 
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.io.Serializable;
-import java.util.*;
+import java.util.Set;
+import java.util.HashSet;
 
 @Setter
 @Getter
-@EqualsAndHashCode(callSuper = true)
-@NodeEntity(label = "药品通用名")
-public class Medicine extends BaseNode implements Serializable {
+@NodeEntity(label = "药品通用名称")
+public class Medicine extends BaseNode  {
 
-    @Property(name = "高危级别")
-    private String risklevel;
+	@Relationship(type = "药品相关药品通用名称", direction = Relationship.INCOMING)
+	private Set<MedCodeName> medcodenames = new HashSet<>();
 
-    @Relationship(type = "药品通用名禁忌性别", direction = Relationship.OUTGOING)
-    private Gender gender;
-
-    @Relationship(type = "药品通用名禁忌年龄", direction = Relationship.OUTGOING)
-    private Age age;
-
-    @Relationship(type = "药品通用名禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌体征", direction = Relationship.OUTGOING)
-    private Set<Vital> vitals = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> lisset = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacs = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌过敏药品", direction = Relationship.OUTGOING)
-    private Set<AllergicMed> allergicmeds = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌手术和操作", direction = Relationship.OUTGOING)
-    private Set<Operation> operations = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌操作", direction = Relationship.OUTGOING)
-    private Set<Procedure> procedures = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> diseases = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups = new HashSet<>();
-
-    @Relationship(type = "药品通用名禁忌配伍", direction = Relationship.OUTGOING)
-    private Set<ConflictMed> conflictmeds = new HashSet<>();
-
-    @Relationship(type="疾病相关药品", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_meds;
-
-    @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_medicine;
-
-    @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.INCOMING)
-    private Set<Medicine> lis_conflict_medicine;
-
-}
+	@Relationship(type = "化验提醒指标相关药品通用名称", direction = Relationship.INCOMING)
+	private Set<LisRemind> lisreminds = new HashSet<>();
 
 
+}

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

@@ -1,23 +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;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "药品名及编码")
-public class Medicine_Code extends BaseNode  {
-
-    @Relationship(type="药品相关化学物质类别", direction = Relationship.OUTGOING)
-    private Set<OralMedicine> medicine_related_chem;
-
-    @Relationship(type="疾病相关药品名及编码", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_medicode;
-
-}

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

@@ -1,38 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "手术和操作")
-public class Operation extends BaseNode  {
-
-    @Property(name = "高危级别")
-    private String risklevel;
-
-    @Relationship(type="疾病相关手术和操作", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
-
-    @Relationship(type="药品通用名禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-
-    @Relationship(type="辅助检查禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
-
-    @Relationship(type="实验室检查禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
-}
-
-

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

@@ -1,34 +1,25 @@
 package com.diagbot.entity.node;
 
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
-import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 @Setter
 @Getter
-@EqualsAndHashCode(callSuper = true)
 @NodeEntity(label = "服用药品")
-public class OralMedicine extends BaseNode implements Serializable {
+public class OralMedicine extends BaseNode  {
 
-    @Relationship(type="疾病相关药品", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_meds;
 
-    @Relationship(type="药品相关化学物质类别", direction = Relationship.INCOMING)
-    private Set<Disease> medicine_related_chem;
-
-    @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_medicine;
-
-    @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.INCOMING)
-    private Set<OralMedicine> lis_conflict_medicine;
-
-}
+	@Relationship(type = "医保手术和操作名称禁忌服用药品", direction = Relationship.INCOMING)
+	private Set<YiBaoOperationName> yibaooperationnames = new HashSet<>();
 
+	@Relationship(type = "辅助检查名称禁忌服用药品", direction = Relationship.INCOMING)
+	private Set<Pacs> pacss = new HashSet<>();
 
+}

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

@@ -1,81 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.Labels;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "辅助检查")
-public class PACS extends BaseNode  {
-
-    @Property(name = "最大值")
-    private Double maxval;
-
-    @Property(name = "最小值")
-    private Double minval;
-
-    @Property(name = "单位")
-    private String unit;
-
-    @Relationship(type = "辅助检查禁忌性别", direction = Relationship.OUTGOING)
-    private Gender gender;
-
-    @Relationship(type="辅助检查禁忌年龄", direction = Relationship.OUTGOING)
-    private Age age;
-
-    @Relationship(type="辅助检查禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌体征", direction = Relationship.OUTGOING)
-    private Set<Vital> vitals = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.OUTGOING)
-    private Set<Medicine> conflict_medicines = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.OUTGOING)
-    private Set<AllergicMed> allergicmeds = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌手术和操作", direction = Relationship.OUTGOING)
-    private Set<Operation> operations = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌操作", direction = Relationship.OUTGOING)
-    private Set<Procedure> procedures = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> liss = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> diseases = new HashSet<>();
-
-    @Relationship(type="辅助检查禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups = new HashSet<>();
-
-    @Relationship(type="疾病相关辅助检查", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_pacs;
-
-    @Relationship(type="药品通用名禁忌辅助检查", direction = Relationship.INCOMING)
-    private Set<Medicine> medicine_conflict_pacs = new HashSet<>();
-
-    @Relationship(type="实验室检查禁忌辅助检查", direction = Relationship.INCOMING)
-    private Set<LIS> lis_conflict_pacs;
-
-    @Relationship(type="医保ICD-10疾病相关辅助检查", direction = Relationship.INCOMING)
-    private Set<Disease> icddis_related_pacs = new HashSet<>();
-}
-
-
-
-
-

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

@@ -0,0 +1,31 @@
+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.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+
+@Setter
+@Getter
+//@EqualsAndHashCode(callSuper = false)
+@NodeEntity(label = "辅助检查危急值")
+public class PacsCritical extends BaseNode  {
+
+    @Property(name = "规则")
+    private String val;
+
+    @Property(name = "辅助检查名称")
+    private String pacsname;
+
+    @Property(name = "危急值提醒")
+    private String remind;
+
+    @Property(name = "科室名称")
+    private String dept;
+
+}
+
+

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

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