Merge branch 'dev/neo2mysql20210120' into test

# Conflicts:
#	cdssman-service/src/main/java/com/diagbot/facade/RuleConvertFacade.java
#	cdssman-service/src/main/java/com/diagbot/facade/SearchDataFacade.java

cdssman-service/pom.xml

@@ -163,11 +163,11 @@
         </dependency>
         <!-- mybatis-plus end -->
 
-        <!--&lt;!&ndash; 阿里巴巴druid数据库连接池 &ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.alibaba</groupId>-->
-            <!--<artifactId>druid-spring-boot-starter</artifactId>-->
-        <!--</dependency>-->
+        <!-- 阿里巴巴druid数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
 
         <!-- springboot整合mybatis（核心就这一个） -->
         <!-- 注意顺序，这个一定要放在最下面 -->
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <version>3.3.1</version>
         </dependency>
 
         <!--mysql-database-->
@@ -191,10 +191,10 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!--<dependency>-->
         <!--<groupId>org.neo4j</groupId>-->
@@ -203,10 +203,10 @@
         <!--<scope>compile</scope>-->
         <!--</dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-http-driver</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- 文件上传相关架包 -->
         <dependency>

cdssman-service/src/main/java/com/diagbot/CdssmanServiceApplication.java

@@ -1,5 +1,6 @@
 package com.diagbot;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -21,7 +22,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @time: 2018/8/7 9:26
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
 @EnableEurekaClient
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard

cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -1,21 +1,47 @@
 package com.diagbot.client;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.hystrix.CdssCoreHystrix;
+import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.IndicationDTO;
+import com.diagbot.dto.KlConceptStaticDTO;
+import com.diagbot.dto.KlRuleByIdParDTO;
+import com.diagbot.dto.KlRuleInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
+import com.diagbot.entity.KlRuleMenuWrapper;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.ConceptVO;
+import com.diagbot.vo.DictionaryInfoVO;
 import com.diagbot.vo.HasStaticKnowledgeVO;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.KlConceptStaticPageVO;
+import com.diagbot.vo.KlConceptStaticVO;
+import com.diagbot.vo.KlRuleByIdVO;
+import com.diagbot.vo.KlRuleInfoClearVO;
+import com.diagbot.vo.KlRuleInfoSaveVO;
+import com.diagbot.vo.KlRuleInfoVO;
+import com.diagbot.vo.KlRuleMenuVO;
+import com.diagbot.vo.KlRuleSatartOrdisaVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
+import com.diagbot.vo.StaticKnowledgeVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -68,4 +94,106 @@ public interface CdssCoreClient {
      */
     @PostMapping("/core/indication")
     RespDTO<IndicationDTO> indication(@Valid @RequestBody IndicationPushVO indicationPushVO);
+
+    /**
+     * 根据名称和类型获取静态知识内容
+     *
+     * @param staticKnowledgeVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/getStaticKnowledge")
+    RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO);
+
+    /**
+     * 分页查询
+     *
+     * @param klConceptStaticPageVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/getPage")
+    RespDTO<Page<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO);
+
+    /**
+     * 保存静态知识
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/saveOrUpdateRecord")
+    RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO);
+
+    /**
+     * 静态知识启用禁用
+     *
+     * @param changeStatusVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/changeStatus")
+    RespDTO<Boolean> changeStatus(@Valid @RequestBody ChangeStatusVO changeStatusVO);
+
+    /**
+     * 根据id获取静态知识
+     *
+     * @param idVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/getRecordById")
+    RespDTO<KlConceptStaticDTO> getRecordById(@Valid @RequestBody IdVO idVO);
+
+    /**
+     * 静态知识是否已存在
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    @PostMapping("/kl/conceptStatic/isExist")
+    RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO);
+
+    /**
+     *获取规则下拉菜单信息
+     * @param klRuleMenuVO
+     * @return
+     */
+    @PostMapping("/klRulePlan/getMenu")
+    RespDTO<List<KlRuleMenuWrapper>> getMenus(@RequestBody KlRuleMenuVO klRuleMenuVO);
+
+   //"分页获取规则维护列表
+    @PostMapping("/klRule/getKlRuleInfoPage")
+    RespDTO<Page<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO);
+
+
+    //根据规则Id获取规则详情
+    @PostMapping("/klRule/getByIdRuleInfo")
+    RespDTO<KlRuleByIdParDTO> getByIdRuleInfoAll(@RequestBody @Valid KlRuleByIdVO klRuleByIdVO);
+
+    //保存规则详情[
+    @PostMapping("/klRule/saveRuleInfo")
+    RespDTO<Boolean> saveRuleInfoAll(@RequestBody @Valid KlRuleInfoSaveVO klRuleInfoSaveVO);
+
+    //刪除规则详情
+    @PostMapping("/klRule/clearRuleInfo")
+    RespDTO<Boolean> clearRuleInfoAll(@RequestBody @Valid KlRuleInfoClearVO klRuleInfoClearVO);
+
+    //停用规则
+    @PostMapping("/klRule/disableRuleInfo")
+    RespDTO<Boolean> disableRuleInfos(@RequestBody @Valid KlRuleSatartOrdisaVO klRuleSatartOrdisaVO);
+
+   //启用规则
+    @PostMapping("/klRule/startRuleInfo")
+    RespDTO<Boolean> startRuleInfos(@RequestBody @Valid KlRuleSatartOrdisaVO klRuleSatartOrdisaVO);
+
+    @PostMapping("/cache/clear")
+    RespDTO<Boolean> clearAlls();
+
+    @PostMapping("/cache/clearDrug")
+    RespDTO<Boolean> clearDrugloadDrug();
+
+    @PostMapping("/cache/clearRuleInfoAll")
+    RespDTO<Boolean> clearRuleAll();
+
+    @PostMapping("/cache/clearStandRuleDrug")
+    RespDTO<Boolean> clearStandRuleDrugAll();
+
+    @PostMapping("/kl/dictionary/getDictionaryInfo")
+    RespDTO<Map<Long, List<DictionaryInfoDTO>>> getDictionaryAll();
 }

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -1,21 +1,42 @@
 package com.diagbot.client.hystrix;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.IndicationDTO;
+import com.diagbot.dto.KlConceptStaticDTO;
+import com.diagbot.dto.KlRuleByIdParDTO;
+import com.diagbot.dto.KlRuleInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
+import com.diagbot.entity.KlRuleMenuWrapper;
+import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.ConceptVO;
+import com.diagbot.vo.DictionaryInfoVO;
 import com.diagbot.vo.HasStaticKnowledgeVO;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.KlConceptStaticPageVO;
+import com.diagbot.vo.KlConceptStaticVO;
+import com.diagbot.vo.KlRuleByIdVO;
+import com.diagbot.vo.KlRuleInfoClearVO;
+import com.diagbot.vo.KlRuleInfoSaveVO;
+import com.diagbot.vo.KlRuleInfoVO;
+import com.diagbot.vo.KlRuleMenuVO;
+import com.diagbot.vo.KlRuleSatartOrdisaVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
+import com.diagbot.vo.StaticKnowledgeVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -84,4 +105,148 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "indication");
         return null;
     }
+
+    /**
+     * 根据名称和类型获取静态知识内容
+     *
+     * @param staticKnowledgeVO
+     * @return
+     */
+    @Override
+    public RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO) {
+        log.error("【hystrix】调用{}异常", "getStaticKnowledge");
+        return null;
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param klConceptStaticPageVO
+     * @return
+     */
+    @Override
+    public RespDTO<Page<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO) {
+        log.error("【hystrix】调用{}异常", "getPage");
+        return null;
+    }
+
+    /**
+     * 保存静态知识
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    @Override
+    public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
+        log.error("【hystrix】调用{}异常", "saveOrUpdateRecord");
+        return null;
+    }
+
+    /**
+     * 静态知识启用禁用
+     *
+     * @param changeStatusVO
+     * @return
+     */
+    @Override
+    public RespDTO<Boolean> changeStatus(@Valid @RequestBody ChangeStatusVO changeStatusVO) {
+        log.error("【hystrix】调用{}异常", "changeStatus");
+        return null;
+    }
+
+    /**
+     * 根据id获取静态知识
+     *
+     * @param idVO
+     * @return
+     */
+    @Override
+    public RespDTO<KlConceptStaticDTO> getRecordById(@Valid @RequestBody IdVO idVO) {
+        log.error("【hystrix】调用{}异常", "getRecordById");
+        return null;
+    }
+
+    /**
+     * 静态知识是否已存在
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    @Override
+    public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
+        log.error("【hystrix】调用{}异常", "isExist");
+        return null;
+    }
+
+    @Override
+    public RespDTO<List<KlRuleMenuWrapper>> getMenus(@RequestBody KlRuleMenuVO klRuleMenuVO) {
+        log.error("【hystrix】调用{}异常", "getMenus");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Page<KlRuleInfoDTO>> getKlRuleInfoPages(@RequestBody KlRuleInfoVO klRuleInfoVO) {
+        log.error("【hystrix】调用{}异常", "getKlRuleInfoPages");
+        return null;
+    }
+
+    @Override
+    public RespDTO<KlRuleByIdParDTO> getByIdRuleInfoAll(@Valid @RequestBody KlRuleByIdVO klRuleByIdVO) {
+        log.error("【hystrix】调用{}异常", "getByIdRuleInfoAll");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> saveRuleInfoAll(@Valid @RequestBody KlRuleInfoSaveVO klRuleInfoSaveVO) {
+        log.error("【hystrix】调用{}异常", "saveRuleInfoAll");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> clearRuleInfoAll(@Valid @RequestBody KlRuleInfoClearVO klRuleInfoClearVO) {
+        log.error("【hystrix】调用{}异常", "clearRuleInfoAll");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> disableRuleInfos(@Valid @RequestBody KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        log.error("【hystrix】调用{}异常", "disableRuleInfos");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> startRuleInfos(@Valid @RequestBody KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        log.error("【hystrix】调用{}异常", "startRuleInfos");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> clearAlls() {
+        log.error("【hystrix】调用{}异常", "clearAlls");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> clearDrugloadDrug() {
+        log.error("【hystrix】调用{}异常", "clearDrugloadDrug");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> clearRuleAll() {
+        log.error("【hystrix】调用{}异常", "clearRuleAll");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> clearStandRuleDrugAll() {
+        log.error("【hystrix】调用{}异常", "clearStandRuleDrugAll");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Map<Long, List<DictionaryInfoDTO>>> getDictionaryAll() {
+        log.error("【hystrix】调用{}异常", "getDictionaryAll");
+        return null;
+    }
 }

cdssman-service/src/main/java/com/diagbot/config/TransactionAspect.java

@@ -1,3 +1,4 @@
+/*
 package com.diagbot.config;
 import org.neo4j.ogm.session.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +15,13 @@ import org.springframework.transaction.TransactionStatus;
 import javax.sql.DataSource;
 
 
+*/
 /**
  * @Description:
  * @Author:zhaops
  * @time: 2021/1/19 12:39
- */
+ *//*
+
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Configuration
 @DependsOn("sessionFactory")
@@ -26,24 +29,28 @@ public class TransactionAspect {
 
     ThreadLocal<TransactionStatus> transactionStatusThreadLocal = new ThreadLocal<>();
 
-    /**
+    */
+/**
      * 定义mysql事务管理器，必须有transactionManager作为默认事务管理器
      *
      * @param dataSource
      * @return
-     */
+     *//*
+
     @Bean("transactionManager")
     @Primary
     public DataSourceTransactionManager transactionManager(DataSource dataSource) {
         return new DataSourceTransactionManager(dataSource);
     }
 
-    /**
+    */
+/**
      * 定义neo4j事务管理器
      *
      * @param sessionFactory
      * @return
-     */
+     *//*
+
     @Bean("neo4jTransactionManager")
     public Neo4jTransactionManager neo4jTransactionManager(SessionFactory sessionFactory) {
         return new Neo4jTransactionManager(sessionFactory);
@@ -61,3 +68,4 @@ public class TransactionAspect {
 }
 
 
+*/

cdssman-service/src/main/java/com/diagbot/dto/BillMsg.java

@@ -14,6 +14,8 @@ public class BillMsg {
     private String msg;
     // 开单名称
     private String orderName;
+    // 明细名称
+    private String orderDetailName;
     // 开单标准名称
     private String orderStandName;
     // 匹配的内容

cdssman-service/src/main/java/com/diagbot/dto/DiseaseAllDetailDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author kwz
+ * @date 2021/3/9
+ * @time 17:08
+ */
+@Getter
+@Setter
+public class DiseaseAllDetailDTO implements Serializable {
+    private Long sid;
+    private String disName;
+    private Integer rid;
+    private String rname;
+    private Long eid;
+    private String itemName;
+}

cdssman-service/src/main/java/com/diagbot/dto/DiseaseDetailDTO.java

@@ -0,0 +1,21 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author kwz
+ * @date 2021/3/9
+ * @time 17:05
+ */
+@Getter
+@Setter
+public class DiseaseDetailDTO implements Serializable {
+    private Long sid;
+    private String disName;
+    List<DiseaseSubDetailDTO> datas = new ArrayList<>();
+}

cdssman-service/src/main/java/com/diagbot/dto/DiseasePageDTO.java

@@ -0,0 +1,39 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author kwz
+ * @date 2021/3/9
+ * @time 14:04
+ */
+@Setter
+@Getter
+public class DiseasePageDTO  {
+
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+
+    /**
+     * 修改人姓名
+     */
+    private String modifier;
+
+    /**
+     * 诊断名称
+     */
+    private String disName;
+}

cdssman-service/src/main/java/com/diagbot/dto/DiseaseSubDetailDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.KlConcept;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author kwz
+ * @date 2021/3/9
+ * @time 17:08
+ */
+@Getter
+@Setter
+public class DiseaseSubDetailDTO implements Serializable {
+    private Integer rid;
+    private String rname;
+    private List<KlConcept> details;
+    private List<Integer> libType;
+}

cdssman-service/src/main/java/com/diagbot/dto/DiseaseTreeDetailDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author kwz
+ * @date 2021/3/11
+ * @time 14:37
+ */
+@Setter
+@Getter
+public class DiseaseTreeDetailDTO {
+    private List<List<String>> types;
+
+    private DiseaseDetailDTO diseaseDetailDTO;
+}

cdssman-service/src/main/java/com/diagbot/dto/GetAllForRelationDTO.java

@@ -0,0 +1,42 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author kongwz
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetAllForRelationDTO {
+	
+	/**
+	 * 概念id
+	 */
+	@ApiModelProperty(value="概念id")
+	private Long conceptId;
+	
+	/**
+	 * 概念名称
+	 */
+	@ApiModelProperty(value="概念名称")
+	private String conceptName;
+
+	/**
+	 * 概念id
+	 */
+	@ApiModelProperty(value="概念id")
+	private Integer libType;
+	
+	/**
+	 * 概念名称(类型)
+	 */
+	@ApiModelProperty(value="概念名称(类型)")
+	private String conceptNameType;
+	
+	
+
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptAllDTO.java

@@ -0,0 +1,37 @@
+package com.diagbot.dto;
+
+import com.diagbot.vo.KlConceptSaveSubVO;
+import io.swagger.models.auth.In;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-02 14:07
+ */
+@Setter
+@Getter
+public class KlConceptAllDTO {
+    private Long conceptId;
+    private Long libId;
+    private String libName;
+    private String spell;
+    private Integer libType;
+    private String typeName;
+    private String synonymName;
+    private Integer status;
+    private Integer isConcept;
+    private Integer sexType;
+    private Integer isHasCommon;
+    private Double minAge;
+    private Double maxAge;
+    private Double minVal;
+    private Double maxVal;
+    private Integer scopeType;
+    private String  icdCode;
+    private String remark;
+    private List<KlConceptAllSubDTO> klConceptSub;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptAllSubDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-12 9:25
+ */
+@Setter
+@Getter
+public class KlConceptAllSubDTO {
+    private Long conceptId;
+    private Long libId;
+    private String libName;
+    private String spell;
+    private Integer libType;
+    private String typeName;
+    private String synonymName;
+    private Integer status;
+    private Integer isConcept;
+    private Integer sexType;
+    private Integer isHasCommon;
+    private String remark;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptDetailDTO.java

@@ -0,0 +1,43 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/2/24 13:39
+ */
+@Getter
+@Setter
+public class KlConceptDetailDTO {
+    /**
+     * 提示概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 提示明细序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
+     */
+    private String contentType;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptInfoDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-01 13:24
+ */
+@Setter
+@Getter
+public class KlConceptInfoDTO {
+    private Long  conceptId;
+    private String libName;
+    private String libType;
+    private String typeName;
+    private String synonymName;
+    private Integer status;
+    private String modifierId;
+    private String modifierName;
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptStaticDTO.java

@@ -0,0 +1,63 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/2/24 13:38
+ */
+@Getter
+@Setter
+public class KlConceptStaticDTO {
+    /**
+     * 术语id
+     */
+    private Long id;
+    /**
+     * 术语名称
+     */
+    private String name;
+    /**
+     * 关联标题
+     */
+    private String title;
+    /**
+     * 术语类型（词性）
+     */
+    private Integer type;
+    /**
+     * 术语类型（词性）
+     */
+    private String typeName;
+    /**
+     * 临床路径名称
+     */
+    private String clinicalPathwayName;
+    /**
+     * 注意事项名称
+     */
+    private String noticeName;
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date gmtModified;
+    /**
+     * 修改人
+     */
+    private String modifier;
+    /**
+     * 启用状态
+     */
+    private Integer status;
+    /**
+     * 明细
+     */
+    List<KlConceptDetailDTO> details;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlLexiconDTO.java

@@ -0,0 +1,90 @@
+package com.diagbot.dto;
+
+import com.diagbot.enums.YesNoEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:25
+ */
+@Getter
+@Setter
+public class KlLexiconDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date gmtModified;
+
+    /**
+     * 操作人
+     */
+    private String operName;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+
+    /**
+     * 是否有通用扩展(0:否;1:是)
+     */
+    private Integer isHasCommon;
+
+    /**
+     * 是否有通用扩展(0:否;1:是)中文
+     */
+    private String isHasCommonCn;
+    public String getIsHasCommonCn() {
+        return YesNoEnum.getName(this.isHasCommon);
+    }
+
+    /**
+     * 是否只有一个(0:否;1:是)
+     */
+    private Integer onlyOne;
+    /**
+     * 是否只有一个(0:否;1:是)中文
+     */
+    private String onlyOneCn;
+    public String getOnlyOneCn() {
+        return YesNoEnum.getName(this.onlyOne);
+    }
+
+    /**
+     * 是否允许修改(0:否;1:是)
+     */
+    private Integer canChange;
+    /**
+     * 是否允许修改(0:否;1:是)中文
+     */
+    private String canChangeCn;
+    public String getCanChangeCn() {
+        return YesNoEnum.getName(this.canChange);
+    }
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlLexiconRelationshipDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:29
+ */
+@Getter
+@Setter
+public class KlLexiconRelationshipDTO extends Page {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date gmtModified;
+
+    /**
+     * 操作人
+     */
+    private String operName;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlRuleByIdParDTO.java

@@ -0,0 +1,27 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-08 13:18
+ */
+@Setter
+@Getter
+public class KlRuleByIdParDTO {
+    private Long parId;
+    private String parDescription;//规则名称
+    private Integer parRuleType;//规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
+    private Long parConceptId;//提示概念id
+    private String parlibName;
+    private Integer parHasSub;//是否有子条件（0：无，1：有）
+    private String parMsg;//附加信息
+    private Integer parStatus;//启用状态（0：禁用，1：启用）
+    private String parLenName;
+    private String parLenCode;
+    private List<KlRuleByIdSubDTO>  klRuleByIdSub;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlRuleByIdSubDTO.java

@@ -0,0 +1,31 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-08 13:16
+ */
+@Setter
+@Getter
+public class KlRuleByIdSubDTO {
+    private Long subId;//基础规则id
+    private String subDescription;//基础规则名称
+    private Long subConceptId;//医学标准术语id
+    private String subLibName;//医学标准术语
+    private String subLenName;//基础规则术语类型
+    private String subLenCode;//基础规则术语编码
+    private Integer subType;//基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
+    private Integer groupType;
+    private String subMinOperator;//最小域比较符
+    private String subMinValue;//最小域值
+    private String subMinUnit;//最小域单位
+    private String subMaxOperator;//最大域比较符
+    private String subMaxValue;//最大域值
+    private String subMaxUnit;//最大域单位
+    private String subEqOperator;//等于域比较符
+    private String subEqValue;//等于域值
+    private String subEqUnit;//等于域单位
+}

cdssman-service/src/main/java/com/diagbot/dto/KlRuleInfoDTO.java

@@ -0,0 +1,65 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-05 13:44
+ */
+@Setter
+@Getter
+public class KlRuleInfoDTO {
+
+    /**
+     * 主键
+     */
+    private Long parId;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 提示概念id
+     */
+    private Long parConceptId;
+
+    private String parConceptName;
+
+
+    private String parLibTypeName;
+    /**
+     * 描述
+     */
+    private String parDescription;
+
+    /**
+     * 规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
+     */
+    private Integer parRuleType;
+
+    /**
+     * 是否有子条件（0：无，1：有）
+     */
+    private Integer parHasSub;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer parStatus;
+
+    /**
+     * 附加信息
+     */
+    private String parMsg;
+}

cdssman-service/src/main/java/com/diagbot/dto/LexiconDTO.java

@@ -0,0 +1,34 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/17 13:19
+ */
+@Getter
+@Setter
+public class LexiconDTO {
+    private Integer libType;
+    private String libTypeName;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        LexiconDTO lexiconDTO = (LexiconDTO) o;
+        return Objects.equals(libType, lexiconDTO.libType)
+                && Objects.equals(libTypeName, lexiconDTO.libTypeName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(libType, libTypeName);
+    }
+}

cdssman-service/src/main/java/com/diagbot/dto/MedClassMedDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/3 15:39
+ */
+@Getter
+@Setter
+public class MedClassMedDTO {
+    private String medClassLibName;
+    private Integer medClassLibType;
+    private Long relationId;
+    private String medLibName;
+    private Integer medLibType;
+}

cdssman-service/src/main/java/com/diagbot/dto/RelationDTO.java

@@ -0,0 +1,21 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/10 16:52
+ */
+@Getter
+@Setter
+public class RelationDTO {
+    private Long sId;
+    private String sName;
+    private Long sType;
+    private Long rId;
+    private Long eId;
+    private String eName;
+    private Long eType;
+}

cdssman-service/src/main/java/com/diagbot/dto/RelationNameDTO.java

@@ -0,0 +1,52 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:kongwz
+ * @time: 2021/3/8 16:15
+ */
+@Getter
+@Setter
+public class RelationNameDTO {
+    /**
+     * 开始conceptid
+     */
+    private Long startId;
+    /**
+     * 关系类型id
+     */
+    private Long relationId;
+    /**
+     * 开始概念名
+     */
+    private String startLibName;
+    /**
+     * 结束conceptid
+     */
+    private Long endId;
+    /**
+     * 结束概念名
+     */
+    private String endLibName;
+    /**
+     * 术语类型
+     */
+    private Long libType;
+    /**
+     * 药品通用名conceptid
+     */
+    private Long medId;
+    /**
+     * 药品通用名
+     */
+    private String medName;
+    /**
+     * 药品术语类型
+     */
+    private Long medLibType;
+}

cdssman-service/src/main/java/com/diagbot/dto/RelationNamesDTO.java

@@ -0,0 +1,37 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:kongwz
+ * @time: 2021/3/8 16:15
+ */
+@Getter
+@Setter
+public class RelationNamesDTO {
+    /**
+     * 开始conceptid
+     */
+    private Long startId;
+    /**
+     * 关系类型id
+     */
+    private Long relationId;
+    /**
+     * 开始概念名
+     */
+    private String startLibName;
+
+    /**
+     * 结束概念名
+     */
+    private Map<Object,Object> data;
+    /**
+     * 下一级术语类型
+     */
+    private Long nextLibType;
+}

cdssman-service/src/main/java/com/diagbot/dto/RelationNodeDTO.java

@@ -0,0 +1,88 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class RelationNodeDTO {
+	
+	/**
+	 * 当前概念id start_id
+	 */
+	private Long conceptId;
+	
+	/**
+	 * 当前概念名称
+	 */
+	private String conceptName;
+	
+	/**
+	 * 当前概念类型id
+	 */
+	private Long conceptTypeId;
+	
+	/**
+	 * 当前概念类型名称
+	 */
+	private String conceptTypeName;
+	
+	/**
+	 * 当前概念名称(类型)
+	 */
+	private String conceptNameType;
+	
+	/**
+	 * 上一级概念id end_id
+	 */
+	private Long parentConceptId;
+	
+	/**
+	 * 上一级概念名称
+	 */
+	private String parentConceptName;
+	
+	/**
+	 * 上一级概念类型id
+	 */
+	private Long parentConceptTypeId;
+	
+	/**
+	 * 上一级概念类型名称
+	 */
+	private String parentConceptTypeName;
+	
+	/**
+	 * 上一级概念名称(类型)
+	 */
+	private String parentConceptNameType;
+	
+	/**
+	 * 当前概念(起点术语) 与 上一级概念(终点术语) 关系id
+	 */
+	private Long relationId;
+	
+	/**
+	 * 当前概念(起点术语) 与 上一级概念(终点术语) 关系名称
+	 */
+	private String relationName;
+	
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	private String isDeletedConcept;
+	
+	/**
+	 * 下一级概念
+	 */
+	private List<RelationNodeDTO> nodeList;
+	
+
+}

cdssman-service/src/main/java/com/diagbot/dto/ResultRulePageDTO.java

@@ -0,0 +1,118 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import com.diagbot.entity.ResultRule;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/15 13:32
+ */
+@Getter
+@Setter
+public class ResultRulePageDTO {
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss", needMerge = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gmtModified;
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 测试结果id
+     */
+    private Long resultId;
+
+    /**
+     * 规则序号
+     */
+    private Long ruleOrderNo;
+
+    /**
+     * 规则类型（1：开单-通用，2：开单-输血，3：危急值-检验，4：危急值-检查，5：高危药品，6：高危手术，7：其他值提醒-检验，8-其他值提醒-检查，9-其他值提醒-输血，10：正常项目重复开立）
+     */
+    private Integer ruleType;
+
+    /**
+     * 规则id
+     */
+    private Long ruleId;
+
+    /**
+     * 开单项类型（编码）
+     */
+    private Integer ruleLibType;
+
+    /**
+     * 开单项类型（名称）
+     */
+    @Excel(name = "规则术语类型", width = 40, orderNum = "2", needMerge = true)
+    private String ruleLibTypeName;
+
+    /**
+     * 开单项名称
+     */
+    @Excel(name = "规则医学标准术语", width = 40, orderNum = "3", needMerge = true)
+    private String ruleLibName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    @Excel(name = "规则医院术语", width = 40, orderNum = "4", needMerge = true)
+    private String ruleHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    @Excel(name = "规则医院术语细项", width = 40, orderNum = "5", needMerge = true)
+    private String ruleHisDetailName;
+
+    /**
+     * 规则组别
+     */
+    @Excel(name = "规则组别", width = 40, orderNum = "6", needMerge = true)
+    private Integer groupType;
+
+    /**
+     * 基础规则
+     */
+    @ExcelCollection(name = "", orderNum = "7")
+    private List<ResultRule> baseRules;
+
+    /**
+     * 实际输出结果（提醒文本）
+     */
+    @Excel(name = "实际结果", width = 60, orderNum = "8", needMerge = true)
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    @Excel(name = "预期结果", width = 60, orderNum = "9", needMerge = true)
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    @Excel(name = "测试结果", width = 20, orderNum = "10", replace = { "失败_0", "成功_1" }, needMerge = true)
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    @Excel(name = "失败原因", width = 60, orderNum = "11", needMerge = true)
+    private String message;
+
+    private String ids;
+}

cdssman-service/src/main/java/com/diagbot/dto/RuleDTO.java

@@ -0,0 +1,40 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 15:40
+ */
+@Getter
+@Setter
+public class RuleDTO {
+    private Long ruleOrderNo;
+    private Integer ruleLibType;
+    private String ruleLibTypeName;
+    private String ruleLibName;
+    private Long ruleId;
+    private Long ruleConceptId;
+    private String ruleDescription;
+    private Integer hasSubCond;
+    private String ruleMsg;
+    private Integer groupType;
+    private Long ruleBaseId;
+    private String ruleBaseDescription;
+    private String ruleBaseEqOperator;
+    private String ruleBaseEqUnit;
+    private String ruleBaseEqValue;
+    private String ruleBaseMaxOperator;
+    private String ruleBaseMaxUnit;
+    private Double ruleBaseMaxValue;
+    private String ruleBaseMinOperator;
+    private String ruleBaseMinUnit;
+    private Double ruleBaseMinValue;
+    private Integer ruleBaseType;
+    private Long ruleBaseConceptId;
+    private String ruleBaseLibName;
+    private Integer ruleBaseLibType;
+    private String ruleBaseLibTypeName;
+}

cdssman-service/src/main/java/com/diagbot/dto/StaticKnowledgeIndexDTO.java

@@ -51,4 +51,8 @@ public class StaticKnowledgeIndexDTO {
      * 是否有治疗方案静态知识
      */
     private Integer hasTreatInfo = 0;
+    /**
+     * 启用禁用
+     */
+    private Integer status;
 }

cdssman-service/src/main/java/com/diagbot/dto/TreeAllDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/10 17:02
+ */
+@Getter
+@Setter
+public class TreeAllDTO {
+    private List<Long> types;
+    private TreeDTO treeDTO;
+}

cdssman-service/src/main/java/com/diagbot/dto/TreeDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/10 17:02
+ */
+@Getter
+@Setter
+public class TreeDTO {
+    private Long id;
+    private String name;
+    private List<TreeDTO> nextTree = new ArrayList<>();
+}

cdssman-service/src/main/java/com/diagbot/entity/KlConcept.java

@@ -0,0 +1,158 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 概念表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlConcept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键,概念id
+     */
+    @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 libId;
+
+    /**
+     * 概念名称(冗余)
+     */
+    private String libName;
+
+    /**
+     * 概念词性type(冗余)
+     */
+    private Integer libType;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer status;
+
+    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 getLibId() {
+        return libId;
+    }
+
+    public void setLibId(Long libId) {
+        this.libId = libId;
+    }
+    public String getLibName() {
+        return libName;
+    }
+
+    public void setLibName(String libName) {
+        this.libName = libName;
+    }
+    public Integer getLibType() {
+        return libType;
+    }
+
+    public void setLibType(Integer libType) {
+        this.libType = libType;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "KlConcept{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", libId=" + libId +
+            ", libName=" + libName +
+            ", libType=" + libType +
+            ", status=" + status +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlConceptCommon.java

@@ -0,0 +1,181 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 概念通用扩展表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlConceptCommon 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 conceptId;
+
+    /**
+     * 性别：1:男, 2:女, 3:通用
+     */
+    private Integer sexType;
+
+    /**
+     * 发生的最小年龄
+     */
+    private Double minAge;
+
+    /**
+     * 发生的最大年龄
+     */
+    private Double maxAge;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+
+    public Integer getSexType() {
+        return sexType;
+    }
+
+    public void setSexType(Integer sexType) {
+        this.sexType = sexType;
+    }
+
+    public Double getMinAge() {
+        return minAge;
+    }
+
+    public void setMinAge(Double minAge) {
+        this.minAge = minAge;
+    }
+
+    public Double getMaxAge() {
+        return maxAge;
+    }
+
+    public void setMaxAge(Double maxAge) {
+        this.maxAge = maxAge;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlConceptCommon{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", sexType=" + sexType +
+                ", minAge=" + minAge +
+                ", maxAge=" + maxAge +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlConceptDetail.java

@@ -0,0 +1,184 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 静态知识内容表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlConceptDetail 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 conceptId;
+
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 提示明细序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
+     */
+    private String contentType;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    @Override
+    public String toString() {
+        return "KlConceptDetail{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", conceptId=" + conceptId +
+            ", title=" + title +
+            ", content=" + content +
+            ", text=" + text +
+            ", orderNo=" + orderNo +
+            ", contentType=" + contentType +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlConceptStatic.java

@@ -0,0 +1,158 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 静态知识标准术语表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlConceptStatic 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 conceptId;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer status;
+
+    /**
+     * 临床路径名称
+     */
+    private String clinicalPathwayName;
+
+    /**
+     * 注意事项名称
+     */
+    private String noticeName;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public String getClinicalPathwayName() {
+        return clinicalPathwayName;
+    }
+
+    public void setClinicalPathwayName(String clinicalPathwayName) {
+        this.clinicalPathwayName = clinicalPathwayName;
+    }
+    public String getNoticeName() {
+        return noticeName;
+    }
+
+    public void setNoticeName(String noticeName) {
+        this.noticeName = noticeName;
+    }
+
+    @Override
+    public String toString() {
+        return "KlConceptStatic{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", conceptId=" + conceptId +
+            ", status=" + status +
+            ", clinicalPathwayName=" + clinicalPathwayName +
+            ", noticeName=" + noticeName +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlDictionaryInfo.java

@@ -0,0 +1,195 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlDictionaryInfo 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 Long groupType;
+
+    /**
+     * 内容
+     */
+    private String name;
+
+    /**
+     * 值
+     */
+    private String val;
+
+    /**
+     * 返回类型（0: 都返回，1：后台维护返回 2：界面返回）
+     */
+    private Integer returnType;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Long groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public void setVal(String val) {
+        this.val = val;
+    }
+
+    public Integer getReturnType() {
+        return returnType;
+    }
+
+    public void setReturnType(Integer returnType) {
+        this.returnType = returnType;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlDictionaryInfo{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", groupType=" + groupType +
+                ", name=" + name +
+                ", val=" + val +
+                ", returnType=" + returnType +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlDisease.java

@@ -0,0 +1,153 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 疾病表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlDisease 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 conceptId;
+
+    /**
+     * ICD10编号
+     */
+    private String icd10Code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+
+    public String getIcd10Code() {
+        return icd10Code;
+    }
+
+    public void setIcd10Code(String icd10Code) {
+        this.icd10Code = icd10Code;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlDisease{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", icd10Code=" + icd10Code +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlDiseaseCorresponding.java

@@ -0,0 +1,75 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlDiseaseCorresponding implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 平安诊断
+     */
+    private String diagPingan;
+
+    /**
+     * 对应的ICD10疾病
+     */
+    private String diagIcd;
+
+    /**
+     * 警惕标志（0：不是警惕 1：警惕）
+     */
+    private Integer highRiskSign;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getDiagPingan() {
+        return diagPingan;
+    }
+
+    public void setDiagPingan(String diagPingan) {
+        this.diagPingan = diagPingan;
+    }
+    public String getDiagIcd() {
+        return diagIcd;
+    }
+
+    public void setDiagIcd(String diagIcd) {
+        this.diagIcd = diagIcd;
+    }
+    public Integer getHighRiskSign() {
+        return highRiskSign;
+    }
+
+    public void setHighRiskSign(Integer highRiskSign) {
+        this.highRiskSign = highRiskSign;
+    }
+
+    @Override
+    public String toString() {
+        return "KlDiseaseCorresponding{" +
+            "id=" + id +
+            ", diagPingan=" + diagPingan +
+            ", diagIcd=" + diagIcd +
+            ", highRiskSign=" + highRiskSign +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlLexicon.java

@@ -0,0 +1,195 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术语分类表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlLexicon 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 name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+
+    /**
+     * 是否有通用扩展(0:否;1:是)
+     */
+    private Integer isHasCommon;
+
+    /**
+     * 是否只有一个(0:否;1:是)
+     */
+    private Integer onlyOne;
+
+    /**
+     * 是否允许修改(0:否;1:是)
+     */
+    private Integer canChange;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getIsHasCommon() {
+        return isHasCommon;
+    }
+
+    public void setIsHasCommon(Integer isHasCommon) {
+        this.isHasCommon = isHasCommon;
+    }
+
+    public Integer getOnlyOne() {
+        return onlyOne;
+    }
+
+    public void setOnlyOne(Integer onlyOne) {
+        this.onlyOne = onlyOne;
+    }
+
+    public Integer getCanChange() {
+        return canChange;
+    }
+
+    public void setCanChange(Integer canChange) {
+        this.canChange = canChange;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlLexicon{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", code=" + code +
+                ", isHasCommon=" + isHasCommon +
+                ", onlyOne=" + onlyOne +
+                ", canChange=" + canChange +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlLexiconRelationship.java

@@ -0,0 +1,153 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术语关系分类表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlLexiconRelationship 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 name;
+
+    /**
+     * 数字编码（501~999）
+     */
+    private Integer code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlLexiconRelationship{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", code=" + code +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlLibraryInfo.java

@@ -0,0 +1,195 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术语表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlLibraryInfo 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 name;
+
+    /**
+     * 概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 是否标准词,1:是,0:否
+     */
+    private Integer isConcept;
+
+    /**
+     * 词性id
+     */
+    private Integer typeId;
+
+    /**
+     * 拼音
+     */
+    private String spell;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+
+    public Integer getIsConcept() {
+        return isConcept;
+    }
+
+    public void setIsConcept(Integer isConcept) {
+        this.isConcept = isConcept;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlLibraryInfo{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", conceptId=" + conceptId +
+                ", isConcept=" + isConcept +
+                ", typeId=" + typeId +
+                ", spell=" + spell +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlLis.java

@@ -0,0 +1,184 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 概念通用扩展表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlLis 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 conceptId;
+
+    /**
+     * 最小值
+     */
+    private Double minValue;
+
+    /**
+     * 最大值
+     */
+    private Double maxValue;
+
+    /**
+     * 类型(0:范围内;1:范围外)
+     */
+    private Integer type;
+
+    /**
+     * 单位概念id
+     */
+    private Long unit;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Double getMinValue() {
+        return minValue;
+    }
+
+    public void setMinValue(Double minValue) {
+        this.minValue = minValue;
+    }
+    public Double getMaxValue() {
+        return maxValue;
+    }
+
+    public void setMaxValue(Double maxValue) {
+        this.maxValue = maxValue;
+    }
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public Long getUnit() {
+        return unit;
+    }
+
+    public void setUnit(Long unit) {
+        this.unit = unit;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlLis{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", conceptId=" + conceptId +
+            ", minValue=" + minValue +
+            ", maxValue=" + maxValue +
+            ", type=" + type +
+            ", unit=" + unit +
+            ", remark=" + remark +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRelation.java

@@ -0,0 +1,167 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术语关系表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlRelation 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 startId;
+
+    /**
+     * 关系id
+     */
+    private Integer relationId;
+
+    /**
+     * 关系终点术语id
+     */
+    private Long endId;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer status;
+
+    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 getStartId() {
+        return startId;
+    }
+
+    public void setStartId(Long startId) {
+        this.startId = startId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Long getEndId() {
+        return endId;
+    }
+
+    public void setEndId(Long endId) {
+        this.endId = endId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRelation{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", startId=" + startId +
+                ", relationId=" + relationId +
+                ", endId=" + endId +
+                ", status=" + status +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRelationOrder.java

@@ -0,0 +1,139 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术语关系排序表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public class KlRelationOrder 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 tRelationId;
+
+    /**
+     * 区域顺序
+     */
+    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 gettRelationId() {
+        return tRelationId;
+    }
+
+    public void settRelationId(Long tRelationId) {
+        this.tRelationId = tRelationId;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRelationOrder{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", tRelationId=" + tRelationId +
+                ", orderNo=" + orderNo +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRule.java

@@ -0,0 +1,184 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 规则信息表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public class KlRule 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 conceptId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
+     */
+    private Integer ruleType;
+
+    /**
+     * 是否有子条件（0：无，1：有）
+     */
+    private Integer hasSubCond;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer status;
+
+    /**
+     * 附加信息
+     */
+    private String msg;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public Integer getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(Integer ruleType) {
+        this.ruleType = ruleType;
+    }
+    public Integer getHasSubCond() {
+        return hasSubCond;
+    }
+
+    public void setHasSubCond(Integer hasSubCond) {
+        this.hasSubCond = hasSubCond;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRule{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", conceptId=" + conceptId +
+            ", description=" + description +
+            ", ruleType=" + ruleType +
+            ", hasSubCond=" + hasSubCond +
+            ", status=" + status +
+            ", msg=" + msg +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRuleBase.java

@@ -0,0 +1,275 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 规则基础表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public class KlRuleBase 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 conceptId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
+     */
+    private Integer type;
+
+    /**
+     * 最小域比较符
+     */
+    private String minOperator;
+
+    /**
+     * 最小域值
+     */
+    private String minValue;
+
+    /**
+     * 最小域单位
+     */
+    private String minUnit;
+
+    /**
+     * 最大域比较符
+     */
+    private String maxOperator;
+
+    /**
+     * 最大域值
+     */
+    private String maxValue;
+
+    /**
+     * 最大域单位
+     */
+    private String maxUnit;
+
+    /**
+     * 等于域比较符
+     */
+    private String eqOperator;
+
+    /**
+     * 等于域值
+     */
+    private String eqValue;
+
+    /**
+     * 等于域单位
+     */
+    private String eqUnit;
+
+    /**
+     * 启用状态（0：禁用，1：启用）
+     */
+    private Integer status;
+
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public String getMinOperator() {
+        return minOperator;
+    }
+
+    public void setMinOperator(String minOperator) {
+        this.minOperator = minOperator;
+    }
+    public String getMinValue() {
+        return minValue;
+    }
+
+    public void setMinValue(String minValue) {
+        this.minValue = minValue;
+    }
+    public String getMinUnit() {
+        return minUnit;
+    }
+
+    public void setMinUnit(String minUnit) {
+        this.minUnit = minUnit;
+    }
+    public String getMaxOperator() {
+        return maxOperator;
+    }
+
+    public void setMaxOperator(String maxOperator) {
+        this.maxOperator = maxOperator;
+    }
+    public String getMaxValue() {
+        return maxValue;
+    }
+
+    public void setMaxValue(String maxValue) {
+        this.maxValue = maxValue;
+    }
+    public String getMaxUnit() {
+        return maxUnit;
+    }
+
+    public void setMaxUnit(String maxUnit) {
+        this.maxUnit = maxUnit;
+    }
+    public String getEqOperator() {
+        return eqOperator;
+    }
+
+    public void setEqOperator(String eqOperator) {
+        this.eqOperator = eqOperator;
+    }
+    public String getEqValue() {
+        return eqValue;
+    }
+
+    public void setEqValue(String eqValue) {
+        this.eqValue = eqValue;
+    }
+    public String getEqUnit() {
+        return eqUnit;
+    }
+
+    public void setEqUnit(String eqUnit) {
+        this.eqUnit = eqUnit;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRuleBase{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", conceptId=" + conceptId +
+            ", description=" + description +
+            ", type=" + type +
+            ", minOperator=" + minOperator +
+            ", minValue=" + minValue +
+            ", minUnit=" + minUnit +
+            ", maxOperator=" + maxOperator +
+            ", maxValue=" + maxValue +
+            ", maxUnit=" + maxUnit +
+            ", eqOperator=" + eqOperator +
+            ", eqValue=" + eqValue +
+            ", eqUnit=" + eqUnit +
+            ", status=" + status +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRuleCondition.java

@@ -0,0 +1,145 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 规则条件表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public class KlRuleCondition 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 ruleId;
+
+    /**
+     * 规则组别
+     */
+    private Integer groupType;
+
+    /**
+     * 提示概念id
+     */
+    private Long ruleBaseId;
+
+    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 getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+    public Integer getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Integer groupType) {
+        this.groupType = groupType;
+    }
+    public Long getRuleBaseId() {
+        return ruleBaseId;
+    }
+
+    public void setRuleBaseId(Long ruleBaseId) {
+        this.ruleBaseId = ruleBaseId;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRuleCondition{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", ruleId=" + ruleId +
+            ", groupType=" + groupType +
+            ", ruleBaseId=" + ruleBaseId +
+        "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRuleMenuWrapper.java

@@ -0,0 +1,18 @@
+package com.diagbot.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-09 10:20
+ */
+@Getter
+@Setter
+public class KlRuleMenuWrapper extends KlRulePlan {
+    private List<KlRuleMenuWrapper> subMenuList = new ArrayList<>();
+}

cdssman-service/src/main/java/com/diagbot/entity/KlRulePlan.java

@@ -0,0 +1,210 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-09
+ */
+public class KlRulePlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资源ID
+     */
+    @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;
+
+    /**
+     * 规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
+     */
+    private Long ruleType;
+
+    /**
+     * -1：表示顶级,其他值表示上级菜单的id
+     */
+    private Long parentId;
+
+    /**
+     * 基础规则类型
+     */
+    private String name;
+
+    private Integer type;
+    private Integer number;
+    /**
+     * 类型编码
+     */
+    private String code;
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    private String remark;
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    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 getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(Long ruleType) {
+        this.ruleType = ruleType;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "KlRulePlan{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", ruleType=" + ruleType +
+                ", parentId=" + parentId +
+                ", name=" + name +
+                ", type=" + type +
+                ", code=" + code +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/ResultBill.java

@@ -62,6 +62,10 @@ public class ResultBill implements Serializable {
      */
     private Integer billType;
 
+    /**
+     * 开单项类型（编码）
+     */
+    private Integer billItemTypeCode;
     /**
      * 开单项类型
      */
@@ -82,6 +86,15 @@ public class ResultBill implements Serializable {
      */
     private String billItemHisDetailName;
 
+    /**
+     *
+     */
+    private Integer conflictType;
+
+    /**
+     * 禁忌项类型（编码）
+     */
+    private Integer conflictItemTypeCode;
     /**
      * 禁忌项类型
      */
@@ -221,6 +234,14 @@ public class ResultBill implements Serializable {
         this.billType = billType;
     }
 
+    public Integer getBillItemTypeCode() {
+        return billItemTypeCode;
+    }
+
+    public void setBillItemTypeCode(Integer billItemTypeCode) {
+        this.billItemTypeCode = billItemTypeCode;
+    }
+
     public String getBillItemType() {
         return billItemType;
     }
@@ -253,6 +274,22 @@ public class ResultBill implements Serializable {
         this.billItemHisDetailName = billItemHisDetailName;
     }
 
+    public Integer getConflictType() {
+        return conflictType;
+    }
+
+    public void setConflictType(Integer conflictType) {
+        this.conflictType = conflictType;
+    }
+
+    public Integer getConflictItemTypeCode() {
+        return conflictItemTypeCode;
+    }
+
+    public void setConflictItemTypeCode(Integer conflictItemTypeCode) {
+        this.conflictItemTypeCode = conflictItemTypeCode;
+    }
+
     public String getConflictItemType() {
         return conflictItemType;
     }
@@ -384,10 +421,13 @@ public class ResultBill implements Serializable {
                 ", modifier=" + modifier +
                 ", resultId=" + resultId +
                 ", billType=" + billType +
+                ", billItemTypeCode=" + billItemTypeCode +
                 ", billItemType=" + billItemType +
                 ", billItemName=" + billItemName +
                 ", billItemHisName=" + billItemHisName +
                 ", billItemHisDetailName=" + billItemHisDetailName +
+                ", conflictType=" + conflictType +
+                ", conflictItemTypeCode=" + conflictItemTypeCode +
                 ", conflictItemType=" + conflictItemType +
                 ", conflictItemName=" + conflictItemName +
                 ", conflictItemHisName=" + conflictItemHisName +
@@ -405,4 +445,4 @@ public class ResultBill implements Serializable {
                 ", inputParams" + inputParams +
                 "}";
     }
-}
+}

cdssman-service/src/main/java/com/diagbot/entity/ResultRule.java

@@ -0,0 +1,542 @@
+package com.diagbot.entity;
+
+import java.math.BigDecimal;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-11
+ */
+@TableName("test_result_rule")
+public class ResultRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    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 resultId;
+
+    /**
+     * 规则序号
+     */
+    private Long ruleOrderNo;
+
+    /**
+     * 规则类型（1：开单-通用，2：开单-输血，3：危急值-检验，4：危急值-检查，5：高危药品，6：高危手术，7：其他值提醒-检验，8-其他值提醒-检查，9-其他值提醒-输血，10：正常项目重复开立）
+     */
+    private Integer ruleType;
+
+    /**
+     * 规则id
+     */
+    private Long ruleId;
+
+    /**
+     * 开单项类型（编码）
+     */
+    private Integer ruleLibType;
+
+    /**
+     * 开单项类型（名称）
+     */
+    private String ruleLibTypeName;
+
+    /**
+     * 开单项名称
+     */
+    private String ruleLibName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    private String ruleHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    private String ruleHisDetailName;
+
+    /**
+     * 是否有子条件（0：无，1：有）
+     */
+    private Integer hasSubCond;
+
+    /**
+     * 基础规则id
+     */
+    private Long ruleBaseId;
+
+    /**
+     * 规则组别
+     */
+    private Integer groupType;
+
+    /**
+     * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
+     */
+    @Excel(name = "基础规则类型", width = 40, orderNum = "1",replace = {"开单外等于术语本身_1","开单外存在比较_2","开单外不等于术语本身_3","过敏原_4","开单项_5","检查结果正则表达式_6"})
+    private Integer ruleBaseType;
+
+    /**
+     * 禁忌项类型（编码）
+     */
+    private Integer ruleBaseLibType;
+
+    /**
+     * 禁忌项类型（名称）
+     */
+    @Excel(name = "基础规则术语类型", width = 40, orderNum = "2")
+    private String ruleBaseLibTypeName;
+
+    /**
+     * 禁忌项名称
+     */
+    @Excel(name = "基础规则医学标准术语", width = 40, orderNum = "3")
+    private String ruleBaseLibName;
+
+    /**
+     * 禁忌项名称（医院端）
+     */
+    @Excel(name = "基础规则医院术语", width = 40, orderNum = "4")
+    private String ruleBaseHisName;
+
+    /**
+     * 禁忌项名称-细项（医院端）
+     */
+    @Excel(name = "基础规则医院术语细则", width = 40, orderNum = "5")
+    private String ruleBaseHisDetailName;
+
+    /**
+     * 禁忌项参考值（最大值）
+     */
+    private BigDecimal ruleBaseMaxValue;
+
+    /**
+     * 禁忌项参考值（最小值）
+     */
+    private BigDecimal ruleBaseMinValue;
+
+    /**
+     * 禁忌项单位
+     */
+    private String ruleBaseUnit;
+
+    /**
+     * 禁忌项输入值（文本/数值）
+     */
+    @Excel(name = "基础规则输入值", width = 40, orderNum = "6")
+    private String ruleBaseInputValue;
+
+    /**
+     * 参考值（参考范围拼接/药品分类保存）
+     */
+    @Excel(name = "基础规则参考值", width = 40, orderNum = "7")
+    private String referenceValue;
+
+    /**
+     * 实际输出结果（提醒文本）
+     */
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+
+    /**
+     * 模拟出参
+     */
+    private String outputParams;
+
+    /**
+     * 附加信息
+     */
+    private String ruleMsg;
+
+    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 getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(Long resultId) {
+        this.resultId = resultId;
+    }
+
+    public Long getRuleOrderNo() {
+        return ruleOrderNo;
+    }
+
+    public void setRuleOrderNo(Long ruleOrderNo) {
+        this.ruleOrderNo = ruleOrderNo;
+    }
+
+    public Integer getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(Integer ruleType) {
+        this.ruleType = ruleType;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public Integer getRuleLibType() {
+        return ruleLibType;
+    }
+
+    public void setRuleLibType(Integer ruleLibType) {
+        this.ruleLibType = ruleLibType;
+    }
+
+    public String getRuleLibTypeName() {
+        return ruleLibTypeName;
+    }
+
+    public void setRuleLibTypeName(String ruleLibTypeName) {
+        this.ruleLibTypeName = ruleLibTypeName;
+    }
+
+    public String getRuleLibName() {
+        return ruleLibName;
+    }
+
+    public void setRuleLibName(String ruleLibName) {
+        this.ruleLibName = ruleLibName;
+    }
+
+    public String getRuleHisName() {
+        return ruleHisName;
+    }
+
+    public void setRuleHisName(String ruleHisName) {
+        this.ruleHisName = ruleHisName;
+    }
+
+    public String getRuleHisDetailName() {
+        return ruleHisDetailName;
+    }
+
+    public void setRuleHisDetailName(String ruleHisDetailName) {
+        this.ruleHisDetailName = ruleHisDetailName;
+    }
+
+    public Integer getHasSubCond() {
+        return hasSubCond;
+    }
+
+    public void setHasSubCond(Integer hasSubCond) {
+        this.hasSubCond = hasSubCond;
+    }
+
+    public Long getRuleBaseId() {
+        return ruleBaseId;
+    }
+
+    public void setRuleBaseId(Long ruleBaseId) {
+        this.ruleBaseId = ruleBaseId;
+    }
+
+    public Integer getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Integer groupType) {
+        this.groupType = groupType;
+    }
+
+    public Integer getRuleBaseType() {
+        return ruleBaseType;
+    }
+
+    public void setRuleBaseType(Integer ruleBaseType) {
+        this.ruleBaseType = ruleBaseType;
+    }
+
+    public Integer getRuleBaseLibType() {
+        return ruleBaseLibType;
+    }
+
+    public void setRuleBaseLibType(Integer ruleBaseLibType) {
+        this.ruleBaseLibType = ruleBaseLibType;
+    }
+
+    public String getRuleBaseLibTypeName() {
+        return ruleBaseLibTypeName;
+    }
+
+    public void setRuleBaseLibTypeName(String ruleBaseLibTypeName) {
+        this.ruleBaseLibTypeName = ruleBaseLibTypeName;
+    }
+
+    public String getRuleBaseLibName() {
+        return ruleBaseLibName;
+    }
+
+    public void setRuleBaseLibName(String ruleBaseLibName) {
+        this.ruleBaseLibName = ruleBaseLibName;
+    }
+
+    public String getRuleBaseHisName() {
+        return ruleBaseHisName;
+    }
+
+    public void setRuleBaseHisName(String ruleBaseHisName) {
+        this.ruleBaseHisName = ruleBaseHisName;
+    }
+
+    public String getRuleBaseHisDetailName() {
+        return ruleBaseHisDetailName;
+    }
+
+    public void setRuleBaseHisDetailName(String ruleBaseHisDetailName) {
+        this.ruleBaseHisDetailName = ruleBaseHisDetailName;
+    }
+
+    public BigDecimal getRuleBaseMaxValue() {
+        return ruleBaseMaxValue;
+    }
+
+    public void setRuleBaseMaxValue(BigDecimal ruleBaseMaxValue) {
+        this.ruleBaseMaxValue = ruleBaseMaxValue;
+    }
+
+    public BigDecimal getRuleBaseMinValue() {
+        return ruleBaseMinValue;
+    }
+
+    public void setRuleBaseMinValue(BigDecimal ruleBaseMinValue) {
+        this.ruleBaseMinValue = ruleBaseMinValue;
+    }
+
+    public String getRuleBaseUnit() {
+        return ruleBaseUnit;
+    }
+
+    public void setRuleBaseUnit(String ruleBaseUnit) {
+        this.ruleBaseUnit = ruleBaseUnit;
+    }
+
+    public String getRuleBaseInputValue() {
+        return ruleBaseInputValue;
+    }
+
+    public void setRuleBaseInputValue(String ruleBaseInputValue) {
+        this.ruleBaseInputValue = ruleBaseInputValue;
+    }
+
+    public String getReferenceValue() {
+        return referenceValue;
+    }
+
+    public void setReferenceValue(String referenceValue) {
+        this.referenceValue = referenceValue;
+    }
+
+    public String getOutput() {
+        return output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String getExpectedOutput() {
+        return expectedOutput;
+    }
+
+    public void setExpectedOutput(String expectedOutput) {
+        this.expectedOutput = expectedOutput;
+    }
+
+    public Integer getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Integer success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getInputParams() {
+        return inputParams;
+    }
+
+    public void setInputParams(String inputParams) {
+        this.inputParams = inputParams;
+    }
+
+    public String getOutputParams() {
+        return outputParams;
+    }
+
+    public void setOutputParams(String outputParams) {
+        this.outputParams = outputParams;
+    }
+
+    public String getRuleMsg() {
+        return ruleMsg;
+    }
+
+    public void setRuleMsg(String ruleMsg) {
+        this.ruleMsg = ruleMsg;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultRule{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", resultId=" + resultId +
+                ", ruleOrderNo=" + ruleOrderNo +
+                ", ruleType=" + ruleType +
+                ", ruleId=" + ruleId +
+                ", ruleLibType=" + ruleLibType +
+                ", ruleLibTypeName=" + ruleLibTypeName +
+                ", ruleLibName=" + ruleLibName +
+                ", ruleHisName=" + ruleHisName +
+                ", ruleHisDetailName=" + ruleHisDetailName +
+                ", hasSubCond=" + hasSubCond +
+                ", ruleBaseId=" + ruleBaseId +
+                ", groupType=" + groupType +
+                ", ruleBaseType=" + ruleBaseType +
+                ", ruleBaseLibType=" + ruleBaseLibType +
+                ", ruleBaseLibTypeName=" + ruleBaseLibTypeName +
+                ", ruleBaseLibName=" + ruleBaseLibName +
+                ", ruleBaseHisName=" + ruleBaseHisName +
+                ", ruleBaseHisDetailName=" + ruleBaseHisDetailName +
+                ", ruleBaseMaxValue=" + ruleBaseMaxValue +
+                ", ruleBaseMinValue=" + ruleBaseMinValue +
+                ", ruleBaseUnit=" + ruleBaseUnit +
+                ", ruleBaseInputValue=" + ruleBaseInputValue +
+                ", referenceValue=" + referenceValue +
+                ", output=" + output +
+                ", expectedOutput=" + expectedOutput +
+                ", success=" + success +
+                ", message=" + message +
+                ", inputParams=" + inputParams +
+                ", outputParams=" + outputParams +
+                ", ruleMsg=" + ruleMsg +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/ResultStaticKnowledge.java

@@ -23,7 +23,7 @@ public class ResultStaticKnowledge implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/node/Age.java

@@ -1,41 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.MedRegNameAge;
-import com.diagbot.entity.relationship.MedicineAge;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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 Age 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 termname;
-
-	@Relationship(type = "药品通用名称禁忌年龄", direction = Relationship.INCOMING)
-	private Set<MedicineAge> medicineAges = new HashSet<>();
-
-	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.INCOMING)
-	private Set<MedRegNameAge> medRegNameAges = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/Allergen.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.PacsNameAllergen;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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<PacsNameAllergen> pacsNameAllergens = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/BillConcept.java

@@ -1,20 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/11/19 13:26
- */
-@Getter
-@Setter
-@QueryResult
-public class BillConcept {
-    private Long id;
-    private String name;
-    private Integer status;
-    private String conceptLabel;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/BillCondition.java

@@ -1,24 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/11/18 16:09
- */
-@Getter
-@Setter
-@QueryResult
-public class BillCondition {
-    private Long id;
-    private String name;
-    private Integer status;
-    private String conditionLabel;
-    private String unit;
-    private Double minValue;
-    private Double maxValue;
-    private Integer range;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/BillConflictItem.java

@@ -1,21 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.PacsNameBillConflictItem;
-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 BillConflictItem extends BaseNode  {
-
-	@Relationship(type = "辅助检查名称禁忌开单项互斥", direction = Relationship.INCOMING)
-	private Set<PacsNameBillConflictItem> pacsNameBillConflictItems = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/BillItem.java

@@ -1,39 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/11/17 13:38
- */
-@Setter
-@Getter
-@QueryResult
-public class BillItem {
-    private String ruleName;
-    private Integer type;
-
-    private Long conceptId;
-    private String conceptName;
-    private String conceptLabel;
-    private Integer conceptStatus;
-
-    private Integer ruleType;
-    private Long relationId;
-    private String relationName;
-    private Integer relationStatus;
-
-    private Long conditionId;
-    private String conditionName;
-    private String conditionLabel;
-    private Double conditionMinValue;
-    private Double conditionMaxValue;
-    private String conditionUnit;
-    private Integer conditionRange;
-    private Integer conditionStatus;
-
-    private String remark;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/BillItemDetail.java

@@ -1,37 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/11/24 16:10
- */
-@Getter
-@Setter
-@QueryResult
-public class BillItemDetail {
-    private String ruleName;
-    private Integer type;
-
-    private Long conceptId;
-    private String conceptName;
-    private String conceptLabel;
-    private Integer conceptStatus;
-
-    private Integer ruleType;
-    private Long relationId;
-    private String relationName;
-    private Integer relationStatus;
-
-    private Long conditionId;
-    private String conditionName;
-    private String conditionLabel;
-    private Double conditionMinValue;
-    private Double conditionMaxValue;
-    private String conditionUnit;
-    private Integer conditionRange;
-    private Integer conditionStatus;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/ClinicalFinding.java

@@ -1,38 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.PacsNameClinicalFinding;
-import com.diagbot.entity.relationship.YiBaoOperationNameClinicalFinding;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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 ClinicalFinding 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<PacsNameClinicalFinding> pacsNameClinicalFindings = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作名称禁忌临床表现", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameClinicalFinding> yiBaoOperationNameClinicalFindings = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/CombiOperation.java

@@ -1,46 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationDisease;
-import com.diagbot.entity.relationship.CombiOperationGender;
-import com.diagbot.entity.relationship.CombiOperationGroup;
-import com.diagbot.entity.relationship.CombiOperationLis;
-import com.diagbot.entity.relationship.CombiOperationMedAllergen;
-import com.diagbot.entity.relationship.CombiOperationPacsDescribe;
-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 CombiOperation extends BaseNode {
-
-
-	@Property(name = "联合操作")
-	private String combi_name;
-
-	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.OUTGOING)
-	private Set<CombiOperationLis> combiOpLiss = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌辅助检查名称描述", direction = Relationship.OUTGOING)
-	private Set<CombiOperationPacsDescribe> combiOppacsdescs = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.OUTGOING)
-	private Set<CombiOperationDisease> combiOpdiseases = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<CombiOperationGroup> combiOpgroups = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.OUTGOING)
-	private Set<CombiOperationMedAllergen> combiOpmedallergens = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌性别", direction = Relationship.OUTGOING)
-	private CombiOperationGender combiOpgender;
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/ConflictDevice.java

@@ -1,26 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.PacsNameConflictDevice;
-import com.diagbot.entity.relationship.YiBaoOperationNameConflictDevice;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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<PacsNameConflictDevice> pacsConflictDevices = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作名称禁忌禁忌医疗器械及物品", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameConflictDevice> yiBaoOperationNameConflictDevices = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/Dept.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/Disease.java

@@ -1,42 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationDisease;
-import com.diagbot.entity.relationship.MedicineDisease;
-import com.diagbot.entity.relationship.PacsNameDisease;
-import com.diagbot.entity.relationship.PacsNameSubNameDisease;
-import com.diagbot.entity.relationship.PacsSubNameDisease;
-import com.diagbot.entity.relationship.YiBaoOperationNameDisease;
-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 Disease extends BaseNode  {
-
-
-	@Relationship(type = "医保手术和操作名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameDisease> yibaooperationnameDiseases = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<PacsNameDisease> pacsNameDiseases = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌疾病", direction = Relationship.INCOMING)
-	private Set<CombiOperationDisease> combioperationDiseases = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称子项目名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<PacsNameSubNameDisease> pacsnamesubnameDiseases = new HashSet<>();
-
-	@Relationship(type = "辅助检查子项目名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<PacsSubNameDisease> pacssubnameDiseases = new HashSet<>();
-
-	@Relationship(type = "药品通用名称禁忌疾病", direction = Relationship.INCOMING)
-	private Set<MedicineDisease> medicineDiseases = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/EntityBaseInfo.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/12/15 9:51
- */
-@Getter
-@Setter
-@QueryResult
-public class EntityBaseInfo {
-    private Long id;
-    private String name;
-    private String pycode;
-    private Integer status;
-    private Integer is_kl;
-    private String labelType;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/EntityInfo.java

@@ -1,102 +0,0 @@
-package com.diagbot.entity.node;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.neo4j.annotation.QueryResult;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/12/14 10:28
- */
-@Getter
-@Setter
-@QueryResult
-public class EntityInfo {
-    private Long id;
-    @NotNull(message = "请输入术语名称")
-    private String name;
-    private String pycode;
-    private Integer status;
-    private Integer is_kl;
-    @NotNull(message = "请输入术语类型")
-    private String labelType;
-
-    //通用属性
-    private String age;
-    @ApiModelProperty(hidden = true)
-    private String ageRange;
-    private String gender;
-    //实验室检查名称、实验室检查、体征、实验室检查危急值
-    private String unit;
-    //医保诊断名称、药物过敏原、药品注册名称
-    private String alias;
-    //药物过敏原、药品注册名称
-    private String result;
-    //实验室检查名称
-    private Double minval;
-    //实验室检查名称
-    private Double maxval;
-    //实验室检查名称
-    private Integer range;
-
-
-    //个性化属性
-    //医保诊断名称属性
-    //"分类", "age(0-200)", "sex", "疾病别称", "dept"
-    private Integer category;
-    private String dept;
-    private Double minAge;
-    private Double maxAge;
-
-    //医保手术和操作属性
-    private String opgrade;
-    private String highriskcond;
-
-    //实验室检查名称
-    //"范围", "最小值", "单位", "最大值"
-
-    //实验室检查
-    //"单位"
-
-    //化验细项及结果
-    //"special"
-    private String special;
-
-    //药物过敏原
-    //"药品类型", "结果", "名称"
-    private String medtype;
-
-    //药品注册名称
-    //"药品高危级别", "禁忌给药途径", "禁忌性别", "结果", "名称"
-    private String risklevel;
-    private String conflict_geiyao;
-    private String conflict_gender;
-
-    //药品代码通用名
-    //"批准文号", "药品本位码", "药品企业", "最小包装数量", "注册规格",
-    //"最小制剂单位", "最小包装单位", "包装材质", "注册剂型", "标准注册剂型"
-    //"最小包装数量"
-    private Double min_pack_num;
-    //"注册剂型"
-    private String reg_JiXin;
-    //"药品本位码"
-    private String benWei_Code;
-    // "最小包装单位"
-    private String min_pack_unit;
-    // "注册规格"
-    private String reg_GuiGe;
-    //"包装材质"
-    private String pack_CaiLiao;
-    //"药品企业"
-    private String producer;
-    //"批准文号"
-    private String license_num;
-    //"最小制剂单位"
-    private String min_prod_unit;
-    //"标准注册剂型"
-    private String stand_reg_JiXin;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/FoodAllergen.java

@@ -1,17 +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;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/12/16 13:14
- */
-@Setter
-@Getter
-@NodeEntity(label = "食物过敏原")
-public class FoodAllergen extends BaseNode {
-}

cdssman-service/src/main/java/com/diagbot/entity/node/Gender.java

@@ -1,42 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationGender;
-import com.diagbot.entity.relationship.LisNameGender;
-import com.diagbot.entity.relationship.LisSetGender;
-import com.diagbot.entity.relationship.PacsNameGender;
-import com.diagbot.entity.relationship.PacsNameSubNameGender;
-import com.diagbot.entity.relationship.YiBaoOperationNameGender;
-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 Gender extends BaseNode {
-
-
-	@Relationship(type = "辅助检查名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<PacsNameGender> pacsNameGenders = new HashSet<>();
-
-	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.INCOMING)
-	private Set<LisSetGender> lissetGenders = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameGender> yibaooperationnameGenders = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称子项目名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<PacsNameSubNameGender> pacsnamesubnameGenders = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌性别", direction = Relationship.INCOMING)
-	private Set<CombiOperationGender> combioperationGenders = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.INCOMING)
-	private Set<LisNameGender> lisnameGenders = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/Group.java

@@ -1,73 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationGroup;
-import com.diagbot.entity.relationship.LisNameGroup;
-import com.diagbot.entity.relationship.LisRemindGroup;
-import com.diagbot.entity.relationship.LisSetGroup;
-import com.diagbot.entity.relationship.MedRegNameGroup;
-import com.diagbot.entity.relationship.MedicineGroup;
-import com.diagbot.entity.relationship.PacsNameGroup;
-import com.diagbot.entity.relationship.PacsNameSubNameGroup;
-import com.diagbot.entity.relationship.PacsSubNameGroup;
-import com.diagbot.entity.relationship.YiBaoOperationNameGroup;
-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 Group 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 groupidx;
-
-	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<LisNameGroup> lisnameGroups = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameGroup> yibaooperationnameGroups = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<PacsNameGroup> pacsNameGroups = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<CombiOperationGroup> combioperationGroups = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<PacsNameSubNameGroup> pacsnamesubnameGroups = new HashSet<>();
-
-	@Relationship(type = "辅助检查子项目名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<PacsSubNameGroup> pacssubnameGroups = new HashSet<>();
-
-	@Relationship(type = "药品通用名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<MedicineGroup> medicineGroups = new HashSet<>();
-
-	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<MedRegNameGroup> medRegNameGroups = new HashSet<>();
-
-	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.INCOMING)
-	private Set<LisSetGroup> lisSetGroups = new HashSet<>();
-
-	@Relationship(type = "化验提醒指标相关禁忌人群", direction = Relationship.INCOMING)
-	private Set<LisRemindGroup> lisRemindgroup = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/GuoLinDiseaseName.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.YiBaoDiseaseNameGuoLinDiseaseName;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "国临疾病名称")
-public class GuoLinDiseaseName extends BaseNode  {
-
-
-	@Relationship(type = "医保疾病名称相关国临疾病名称", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseNameGuoLinDiseaseName> yibaodiseasenameGuoLinDiseaseNames = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/GuoLinICD_10Code.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.YiBaoDiseaseNameGuoLinICD_10Code;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "国临ICD_10代码")
-public class GuoLinICD_10Code extends BaseNode  {
-
-
-	@Relationship(type = "医保疾病名称相关国临ICD-10代码", direction = Relationship.INCOMING)
-	private Set<YiBaoDiseaseNameGuoLinICD_10Code> yibaodiseasenameGuoLinICD_10Codes = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/GuoLinICD_9_CM3Code.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.YiBaoOperationNameGuoLinICD_9_CM3Code;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "国临ICD_9_CM3代码")
-public class GuoLinICD_9_CM3Code extends BaseNode  {
-
-
-	@Relationship(type = "医保手术和操作名称相关国临ICD-9-CM3代码", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameGuoLinICD_9_CM3Code> yibaooperationnameGuoLinICD_9_CM3Codes = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/GuoLinOperationName.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.YiBaoOperationNameGuoLinOperationName;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "国临手术和操作名称")
-public class GuoLinOperationName extends BaseNode {
-
-
-	@Relationship(type = "医保手术和操作名称相关国临手术和操作名称", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameGuoLinOperationName> yiBaoOperationNameGuoLinOperationNames = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/HerbDeptClass.java

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.MedCodeNameHerbDeptClass;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "中成药科室类别")
-public class HerbDeptClass extends BaseNode {
-
-
-	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.INCOMING)
-	private Set<MedCodeNameHerbDeptClass> medcodenameHerbDeptClass = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/HerbFangJiCate.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/HerbFangJiClass.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/HerbYiBaoClass.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/HerbZhiLiaoClass.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/Lis.java

@@ -1,51 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationLis;
-import com.diagbot.entity.relationship.PacsNameLis;
-import com.diagbot.entity.relationship.YiBaoOperationNameLis;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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;
-
-	@Property(name = "实验室检查指标")
-	private String lisidx;
-
-	@Relationship(type = "医保手术和操作名称禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameLis> yibaooperationnameLis = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<PacsNameLis> pacsNameLis = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<CombiOperationLis> combioperationLis = new HashSet<>();
-
-//	@Relationship(type = "辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
-//	private Set<Pacs> pacss = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作禁忌实验室检查", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameLis> yibaooperationNameLis = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisAlias.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/LisBigName.java

@@ -1,30 +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;
-
-@Setter
-@Getter
-@NodeEntity(label = "化验套餐名称")
-public class LisBigName 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;
-
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisCode.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/LisCritical.java

@@ -1,41 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.LisNameLisCritical;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Property;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "实验室检查危急值")
-public class LisCritical extends BaseNode  {
-
-    @Property(name = "高危急值")
-    private String maxval;
-
-    @Property(name = "低危急值")
-    private String minval;
-
-    @Property(name = "单位")
-    private String unit;
-
-    @Property(name = "年龄")
-    private String age;
-
-    @Property(name = "危急值范围")
-    private String range;
-
-    @Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.INCOMING)
-    private Set<LisNameLisCritical> lisnameLisCriticals = new HashSet<>();
-
-}
-
-

cdssman-service/src/main/java/com/diagbot/entity/node/LisFirstClass.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/LisName.java

@@ -1,69 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.LisNameGender;
-import com.diagbot.entity.relationship.LisNameGroup;
-import com.diagbot.entity.relationship.LisNameLisAlias;
-import com.diagbot.entity.relationship.LisNameLisCode;
-import com.diagbot.entity.relationship.LisNameLisCritical;
-import com.diagbot.entity.relationship.LisNameLisFirstClass;
-import com.diagbot.entity.relationship.LisNameLisSecondClass;
-import com.diagbot.entity.relationship.LisNameLisSet;
-import com.diagbot.entity.relationship.LisNameYiBaoDiseaseName;
-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 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<LisNameLisCode> lisNameliscodes = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关实验室检查别名", direction = Relationship.OUTGOING)
-	private Set<LisNameLisAlias> lisNamelisaliass = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关实验室检查一级分类", direction = Relationship.OUTGOING)
-	private Set<LisNameLisFirstClass> lisNamelisfirstclasss = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关实验室检查二级分类", direction = Relationship.OUTGOING)
-	private Set<LisNameLisSecondClass> lisNamelissecondclasss = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.OUTGOING)
-	private Set<LisNameLisSet> lisNamelissets = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<LisNameGroup> lisNamegroups = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称禁忌性别", direction = Relationship.OUTGOING)
-	private LisNameGender lisNamegender;
-
-	@Relationship(type="实验室检查名称相关实验室检查危急值", direction = Relationship.OUTGOING)
-	private Set<LisNameLisCritical> lisNameliscritials = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关医保疾病名称", direction = Relationship.OUTGOING)
-	private Set<LisNameYiBaoDiseaseName> lisNamedisease = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisRemind.java

@@ -1,48 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.LisRemindGroup;
-import com.diagbot.entity.relationship.LisRemindMedicine;
-import com.diagbot.entity.relationship.LisRemindYiBaoDiseaseName;
-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<LisRemindYiBaoDiseaseName> lisReminddisease = new HashSet<>();
-
-	@Relationship(type = "化验提醒指标相关禁忌人群", direction = Relationship.OUTGOING)
-	private Set<LisRemindGroup> lisRemindgroup = new HashSet<>();
-
-	@Relationship(type = "化验提醒指标相关药品通用名称", direction = Relationship.OUTGOING)
-	private Set<LisRemindMedicine> lisRemindmedicines = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisResult.java

@@ -1,43 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.LisResultYiBaoDiseaseName;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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<LisResultYiBaoDiseaseName> lisResultdisease = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisSecondClass.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/LisSet.java

@@ -1,42 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.LisNameLisSet;
-import com.diagbot.entity.relationship.LisSetGender;
-import com.diagbot.entity.relationship.LisSetGroup;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-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 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 LisSetGender lisSetgender;
-
-	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.OUTGOING)
-	private Set<LisSetGroup> lisSetGroups = new HashSet<>();
-
-	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.INCOMING)
-	private Set<LisNameLisSet> lisnamelisSet = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/LisSubNameAndResult.java

@@ -1,20 +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;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/12/16 13:23
- */
-@Getter
-@Setter
-@NodeEntity(label = "化验细项及结果")
-public class LisSubNameAndResult extends BaseNode {
-    @Property(name = "special")
-    private String special;
-}

cdssman-service/src/main/java/com/diagbot/entity/node/MedAllergen.java

@@ -1,48 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.CombiOperationMedAllergen;
-import com.diagbot.entity.relationship.MedRegNameMedAllergen;
-import com.diagbot.entity.relationship.MedicineMedAllergen;
-import com.diagbot.entity.relationship.PacsNameMedAllergen;
-import com.diagbot.entity.relationship.PacsNameSubNameMedAllergen;
-import com.diagbot.entity.relationship.PacsSubNameMedAllergen;
-import com.diagbot.entity.relationship.YiBaoOperationNameMedAllergen;
-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 MedAllergen extends BaseNode {
-
-	@Property(name = "药品类型")
-	private String medtype;
-
-	@Relationship(type = "辅助检查名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsNameMedAllergen> pacsMedAllergens = new HashSet<>();
-
-	@Relationship(type = "医保手术和操作名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<YiBaoOperationNameMedAllergen> yibaooperationnameMedAllergens = new HashSet<>();
-
-	@Relationship(type = "辅助检查名称子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsNameSubNameMedAllergen> pacsnamesubnameMedAllergens = new HashSet<>();
-
-	@Relationship(type = "辅助检查子项目名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsSubNameMedAllergen> pacssubnameMedAllergens = new HashSet<>();
-
-	@Relationship(type = "联合项目禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<CombiOperationMedAllergen> combioperationMedAllergens = new HashSet<>();
-
-	@Relationship(type = "药品通用名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<MedicineMedAllergen> medicineMedAllergens = new HashSet<>();
-
-	@Relationship(type = "药品注册名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<MedRegNameMedAllergen> medRegNameMedAllergens = new HashSet<>();
-}

cdssman-service/src/main/java/com/diagbot/entity/node/MedChemClass.java

@@ -1,21 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "药品化学物质类别")
-public class MedChemClass extends BaseNode  {
-
-
-	@Relationship(type = "药品相关药品化学物质类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/MedClass.java

@@ -1,21 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Setter
-@Getter
-@NodeEntity(label = "药品类别")
-public class MedClass extends BaseNode {
-
-
-	@Relationship(type = "药品相关药品类别", direction = Relationship.INCOMING)
-	private Set<MedCodeName> medcodenames = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/MedCode.java

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

cdssman-service/src/main/java/com/diagbot/entity/node/MedCodeName.java

@@ -1,117 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.entity.node.base.BaseNode;
-import com.diagbot.entity.relationship.MedCodeNameHerbDeptClass;
-import com.diagbot.entity.relationship.MedCodeNameHerbFangJiCate;
-import com.diagbot.entity.relationship.MedCodeNameHerbFangJiClass;
-import com.diagbot.entity.relationship.MedCodeNameHerbYiBaoClass;
-import com.diagbot.entity.relationship.MedCodeNameHerbZhiLiaoClass;
-import com.diagbot.entity.relationship.MedCodeNameMedChemClass;
-import com.diagbot.entity.relationship.MedCodeNameMedClass;
-import com.diagbot.entity.relationship.MedCodeNameMedCode;
-import com.diagbot.entity.relationship.MedCodeNameMedJiePouClass;
-import com.diagbot.entity.relationship.MedCodeNameMedProdName;
-import com.diagbot.entity.relationship.MedCodeNameMedRegName;
-import com.diagbot.entity.relationship.MedCodeNameMedYaoLiClass;
-import com.diagbot.entity.relationship.MedCodeNameMedYiBaoClass;
-import com.diagbot.entity.relationship.MedCodeNameMedZhiLiaoClass;
-import com.diagbot.entity.relationship.MedCodeNameMedicine;
-import com.diagbot.entity.relationship.MedCodeNameProdName;
-import com.diagbot.entity.relationship.MedCodeNameRegName;
-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 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;
-
-	@Property(name = "标准注册剂型")
-	private String stand_reg_JiXin;
-
-	@Relationship(type = "药品相关药品类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedClass> medCodeNameMedclasss = new HashSet<>();
-
-	@Relationship(type = "药品相关药品注册名称", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedRegName> medCodeNameMedregnames = new HashSet<>();
-
-	@Relationship(type = "药品相关药品通用名称", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedicine> medCodeNameMedicines = new HashSet<>();
-
-	@Relationship(type = "药品相关药品化学物质类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedChemClass> medCodeNameMedchemclass = new HashSet<>();
-
-	@Relationship(type = "药品相关药品药理学类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedYaoLiClass> medCodeNameMedyaoliclass = new HashSet<>();
-
-	@Relationship(type = "药品相关药品治疗学类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedZhiLiaoClass> medCodeNameMedzhiliaoclass = new HashSet<>();
-
-	@Relationship(type = "药品相关药品解剖学类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedJiePouClass> medCodeNameMedjiepouclass = new HashSet<>();
-
-	@Relationship(type = "药品相关药品代码", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedCode> medCodeNameMedcodes = new HashSet<>();
-
-	@Relationship(type = "药品相关药品商品名称", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedProdName> medCodeNameMedprodnames = new HashSet<>();
-
-	@Relationship(type = "药品相关药品医保类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameMedYiBaoClass> medCodeNameMedyibaoclass = new HashSet<>();
-
-	@Relationship(type = "药品相关注册名称", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameRegName> medCodeNameRegnames = new HashSet<>();
-
-	@Relationship(type = "药品相关中成药方剂学大类", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameHerbFangJiCate> medCodeNameHerbfangjicates = new HashSet<>();
-
-	@Relationship(type = "药品相关中成药方剂学类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameHerbFangJiClass> medCodeNameHerbfangjiclass = new HashSet<>();
-
-	@Relationship(type = "药品相关中成药治疗学类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameHerbZhiLiaoClass> medCodeNameHerbzhiliaoclass = new HashSet<>();
-
-	@Relationship(type = "药品相关中成药科室类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameHerbDeptClass> medCodeNameHerbdeptclass = new HashSet<>();
-
-	@Relationship(type = "药品相关中成药医保类别", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameHerbYiBaoClass> medCodeNameHerbyibaoclass = new HashSet<>();
-
-	@Relationship(type = "药品相关商品名称", direction = Relationship.OUTGOING)
-	private Set<MedCodeNameProdName> medCodeNameProdnames = new HashSet<>();
-
-}

cdssman-service/src/main/java/com/diagbot/entity/node/MedJiePouClass.java

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