Merge branch 'dev/neo2mysql20210120' into debug

cdssman-service/doc/001.20210125自动化测试初始化脚本/cdss_init.sql

@@ -105,7 +105,7 @@ CREATE TABLE `test_result_bill`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
@@ -159,7 +159,7 @@ CREATE TABLE `test_result_critical`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
@@ -205,7 +205,7 @@ CREATE TABLE `test_result_highrisk_drug`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
@@ -260,7 +260,7 @@ CREATE TABLE `test_result_highrisk_operation`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
@@ -386,7 +386,7 @@ CREATE TABLE `test_result_static_knowledge`  (
   `his_detail_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '医院术语-细项',
   `has_stand_name` int(2) NULL DEFAULT NULL COMMENT '是否有标准词（0：无，1：有）',
   `has_static_knowledge` int(2) NULL DEFAULT NULL COMMENT '是否有静态知识（0：无，1：有）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
@@ -479,7 +479,7 @@ CREATE TABLE `test_result_other_lis`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
@@ -535,7 +535,7 @@ CREATE TABLE `test_result_other_pacs`  (
   `output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '输出结果（提醒文本）',
   `expected_output` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '期望输出结果（提醒文本）',
   `success` int(4) NULL DEFAULT NULL COMMENT '成功标志（1：成功，0：失败）',
-  `message` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
+  `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息（异常提醒）',
   `input_params` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模拟入参',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;

cdssman-service/pom.xml

@@ -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-->

cdssman-service/src/main/java/com/diagbot/aggregate/RuleTestAggregate.java

@@ -13,19 +13,20 @@ import com.diagbot.entity.ResultInfo;
 import com.diagbot.entity.ResultOtherLis;
 import com.diagbot.entity.ResultOtherPacs;
 import com.diagbot.entity.ResultOtherTransfusion;
-import com.diagbot.entity.node.BillItem;
+import com.diagbot.entity.ResultRule;
 import com.diagbot.entity.node.LisCritical;
 import com.diagbot.entity.node.LisRemind;
 import com.diagbot.entity.node.MedRegName;
 import com.diagbot.entity.node.PacsCritical;
 import com.diagbot.entity.node.PacsRemind;
-import com.diagbot.entity.node.TransfusionRemind;
 import com.diagbot.entity.node.TransfusionSuggest;
 import com.diagbot.entity.node.YiBaoOperationName;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.NeoEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.TypeEnum;
+import com.diagbot.facade.MedRuleConvertFacade;
+import com.diagbot.facade.MedSearchDataFacade;
 import com.diagbot.facade.RuleConvertFacade;
 import com.diagbot.facade.RunningInfoFacade;
 import com.diagbot.facade.SearchDataFacade;
@@ -46,6 +47,7 @@ import com.diagbot.service.ResultInfoService;
 import com.diagbot.service.ResultOtherLisService;
 import com.diagbot.service.ResultOtherPacsService;
 import com.diagbot.service.ResultOtherTransfusionService;
+import com.diagbot.service.ResultRuleService;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
@@ -85,6 +87,9 @@ public class RuleTestAggregate {
     @Qualifier("resultBillServiceImpl")
     private ResultBillService resultBillService;
     @Autowired
+    @Qualifier("resultRuleServiceImpl")
+    private ResultRuleService resultRuleService;
+    @Autowired
     @Qualifier("resultInfoServiceImpl")
     private ResultInfoService resultInfoService;
     @Autowired
@@ -129,9 +134,13 @@ public class RuleTestAggregate {
 
     @Autowired
     private RuleConvertFacade ruleConvertFacade;
+    @Autowired
+    private MedRuleConvertFacade medRuleConvertFacade;
 
     @Autowired
     private SearchDataFacade searchDataFacade;
+    @Autowired
+    private MedSearchDataFacade medSearchDataFacade;
 
     @DataProvider("ruleTest")
     public Boolean ruleTest(
@@ -179,20 +188,18 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean billRuleTestExe(BillRuleVO billRuleVO) {
         Long hospitalId = billRuleVO.getHospitalId();
 
-        List<BillItem> billRules = billManRepository.getAllRules();
         //生成测试规则
-        List<ResultBill> resultList = ruleConvertFacade.billRuleConvert(billRules, hospitalId);
+        List<ResultRule> resultList = medRuleConvertFacade.billConvert(hospitalId, 1L);
         if (ListUtil.isEmpty(resultList)) {
             return true;
         }
         //远程调用推理
-        List<ResultBill> saveList = callBill(resultList, hospitalId);
+        List<ResultRule> saveList = callBill(resultList, hospitalId);
         //保存测试结果
-        saveResultBill(saveList, billRuleVO);
+        saveResultRule(saveList, billRuleVO);
         return true;
     }
 
@@ -218,19 +225,18 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean billTransfusionRuleTestExe(BillRuleVO billRuleVO) {
         Long hospitalId = billRuleVO.getHospitalId();
-        List<TransfusionRemind> billRules_transfusion = transfusionRemindRepository.findByStatus(StatusEnum.Enable.getKey());
+
         //生成测试规则
-        List<ResultBill> resultList = ruleConvertFacade.billRuleConvert_transfusion(billRules_transfusion, hospitalId);
+        List<ResultRule> resultList = medRuleConvertFacade.billConvert(hospitalId, billRuleVO.getCaseId());
         if (ListUtil.isEmpty(resultList)) {
             return true;
         }
         //远程调用推理
-        List<ResultBill> saveList = callBill(resultList, hospitalId);
+        List<ResultRule> saveList = callBill(resultList, hospitalId);
         //保存测试结果
-        saveResultBill(saveList, billRuleVO);
+        saveResultRule(saveList, billRuleVO);
         return true;
     }
 
@@ -255,7 +261,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean criticalLisRuleTestExe(CriticalRuleVO criticalRuleVO) {
         Long hospitalId = criticalRuleVO.getHospitalId();
         List<LisCritical> criticalRules_lis = lisCriticalRepository.findCustomByStatus(StatusEnum.Enable.getKey());
@@ -289,7 +294,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean criticalPacsRuleTestExe(CriticalRuleVO criticalRuleVO) {
         Long hospitalId = criticalRuleVO.getHospitalId();
         List<PacsCritical> criticalRules_pacs = pacsCriticalRepository.findByStatus(StatusEnum.Enable.getKey());
@@ -323,7 +327,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean highriskDrugRuleTestExe(HighriskRuleVO highriskRuleVO) {
         Long hospitalId = highriskRuleVO.getHospitalId();
         List<MedRegName> items = medRegNameRepository.findByStatusAndRisklevelExists(1);
@@ -357,7 +360,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean highriskOperationRuleTestExe(HighriskRuleVO highriskRuleVO) {
         Long hospitalId = highriskRuleVO.getHospitalId();
         List<YiBaoOperationName> items = yiBaoOperationNameRepository.findByStatusAndOpgradeExists(1);
@@ -392,7 +394,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean otherLisRuleTestExe(OtherRuleVO otherRuleVO) {
         Long hospitalId = otherRuleVO.getHospitalId();
         List<LisRemind> items = lisRemindRepository.findByStatus(1);
@@ -427,7 +428,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean otherPacsRuleTestExe(OtherRuleVO otherRuleVO) {
         Long hospitalId = otherRuleVO.getHospitalId();
         List<PacsRemind> items = pacsRemindRepository.findByStatus(1);
@@ -462,7 +462,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-    @Transactional
     public Boolean otherTransfusionRuleTestExe(OtherRuleVO otherRuleVO) {
         Long hospitalId = otherRuleVO.getHospitalId();
         List<TransfusionSuggest> items = transfusionSuggestRepository.findByStatus(1);
@@ -483,48 +482,50 @@ public class RuleTestAggregate {
      * @param hospitalId
      * @return
      */
-    public List<ResultBill> callBill(List<ResultBill> list, Long hospitalId) {
-        List<ResultBill> retList = Lists.newLinkedList();
+    public List<ResultRule> callBill(List<ResultRule> list, Long hospitalId) {
+        List<ResultRule> retList = Lists.newLinkedList();
         if (ListUtil.isEmpty(list)) {
             return retList;
         }
-        for (ResultBill resultBill : list) {
-            if (resultBill.getSuccess() != null
-                    && resultBill.getSuccess().equals(0)) {
-                retList.add(resultBill);
+        for (ResultRule result : list) {
+            if (result.getSuccess() != null
+                    && result.getSuccess().equals(0)) {
+                retList.add(result);
                 continue;
             }
-            IndicationPushVO indicationPushVO = searchDataFacade.createBillVO(resultBill);
+            //IndicationPushVO indicationPushVO = searchDataFacade.createBillVO(resultBill);
+            IndicationPushVO indicationPushVO = medSearchDataFacade.createBillVO(result);
             indicationPushVO.setHospitalId(hospitalId);
 
-            resultBill.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
+            result.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
 
             RespDTO<IndicationDTO> respDTO = cdssCoreClient.indication(indicationPushVO);
             if (RespDTOUtil.respIsOK(respDTO)) {
                 IndicationDTO data = respDTO.data;
+                result.setOutputParams(FastJsonUtils.getBeanToJson(respDTO.data));
                 List<BillMsg> billMsgList = data.getBillMsgList();
                 if (ListUtil.isEmpty(billMsgList)) {
-                    resultBill.setSuccess(0);
-                    resultBill.setMessage("未提示开单项");
-                    retList.add(resultBill);
+                    result.setSuccess(0);
+                    result.setMessage("提醒信息未出现");
+                    retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
-                        ResultBill saveResultBill = new ResultBill();
-                        BeanUtil.copyProperties(resultBill, saveResultBill);
-                        saveResultBill.setOutput(billMsg.getMsg());
-                        if (saveResultBill.getOutput().equals(saveResultBill.getExpectedOutput())) {
-                            saveResultBill.setSuccess(1);
+                        ResultRule saveResult = new ResultRule();
+                        BeanUtil.copyProperties(result, saveResult);
+                        saveResult.setOutput(billMsg.getMsg());
+                        if (saveResult.getOutput().equals(saveResult.getExpectedOutput())) {
+                            saveResult.setSuccess(1);
                         } else {
-                            saveResultBill.setSuccess(0);
-                            saveResultBill.setMessage("提示内容与预期不符");
+                            saveResult.setSuccess(0);
+                            saveResult.setMessage("提示内容与预期不符");
                         }
-                        retList.add(saveResultBill);
+                        retList.add(saveResult);
                     }
                 }
             } else {
-                resultBill.setSuccess(0);
-                resultBill.setMessage("远程调用推理接口失败");
-                retList.add(resultBill);
+                result.setSuccess(0);
+                result.setMessage("远程调用推理接口失败");
+                retList.add(result);
             }
         }
         return retList;
@@ -559,7 +560,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getCriticalValList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("未提示开单项");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -613,7 +614,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getHighRiskList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("未提示开单项");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -667,7 +668,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getHighRiskList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("未提示高危项");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -721,7 +722,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getOtherList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("其他值未提醒");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -781,7 +782,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getOtherList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("其他值未提醒");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -835,7 +836,7 @@ public class RuleTestAggregate {
                 List<BillMsg> billMsgList = data.getOtherList();
                 if (ListUtil.isEmpty(billMsgList)) {
                     result.setSuccess(0);
-                    result.setMessage("其他值未提醒");
+                    result.setMessage("提醒信息未出现");
                     retList.add(result);
                 } else {
                     for (BillMsg billMsg : billMsgList) {
@@ -867,7 +868,8 @@ public class RuleTestAggregate {
      * @param billRuleVO
      * @return
      */
-    public Boolean saveResultBill(List<ResultBill> list, BillRuleVO billRuleVO) {
+    @Transactional
+    public Boolean saveResultRule(List<ResultRule> list, BillRuleVO billRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
         Integer successNum = list.stream().filter(i -> i.getSuccess().equals(1)).collect(Collectors.toList()).size();
@@ -893,14 +895,13 @@ public class RuleTestAggregate {
         resultBillQueryWrapper.eq("result_id", resultInfo.getId());
         resultBillService.remove(resultBillQueryWrapper);
 
-        for (ResultBill resultBill : list) {
-            resultBill.setBillType(billRuleVO.getBillType());
-            resultBill.setGmtCreate(now);
-            resultBill.setGmtModified(now);
-            resultBill.setResultId(resultInfo.getId());
+        for (ResultRule resultRule : list) {
+            resultRule.setGmtCreate(now);
+            resultRule.setGmtModified(now);
+            resultRule.setResultId(resultInfo.getId());
         }
 
-        resultBillService.saveOrUpdateBatch(list);
+        resultRuleService.saveOrUpdateBatch(list);
         return true;
     }
 
@@ -911,6 +912,7 @@ public class RuleTestAggregate {
      * @param criticalRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultCritical(List<ResultCritical> list, CriticalRuleVO criticalRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
@@ -955,6 +957,7 @@ public class RuleTestAggregate {
      * @param highriskRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultHighrisk_drug(List<ResultHighriskDrug> list, HighriskRuleVO highriskRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
@@ -998,6 +1001,7 @@ public class RuleTestAggregate {
      * @param highriskRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultHighrisk_operation(List<ResultHighriskOperation> list, HighriskRuleVO highriskRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
@@ -1041,6 +1045,7 @@ public class RuleTestAggregate {
      * @param otherRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultOther_lis(List<ResultOtherLis> list, OtherRuleVO otherRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
@@ -1084,6 +1089,7 @@ public class RuleTestAggregate {
      * @param otherRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultOther_pacs(List<ResultOtherPacs> list, OtherRuleVO otherRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();
@@ -1128,6 +1134,7 @@ public class RuleTestAggregate {
      * @param otherRuleVO
      * @return
      */
+    @Transactional
     public Boolean saveResultOther_transfusion(List<ResultOtherTransfusion> list, OtherRuleVO otherRuleVO) {
         Date now = new Date();
         Integer totleNum = list.size();

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

@@ -1,18 +1,41 @@
 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.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.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;
@@ -68,4 +91,92 @@ 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);
+
 }

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

@@ -1,15 +1,33 @@
 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.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.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;
@@ -84,4 +102,118 @@ 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;
+    }
 }

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,20 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+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;
+}

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,21 @@
+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;
+    List<KlConcept> details;
+}

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

@@ -75,13 +75,13 @@ public class ExportCriticalLisDTO {
     /**
      * 开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语）", width = 40, orderNum = "3")
     private String criticalItemHisName;
 
     /**
      * 开单项名称-细项（医院端）
      */
-    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "4")
     private String criticalItemHisDetailName;
 
     /**

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

@@ -0,0 +1,36 @@
+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;
+	
+	/**
+	 * 概念名称(类型)
+	 */
+	@ApiModelProperty(value="概念名称(类型)")
+	private String conceptNameType;
+	
+	
+
+}

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

@@ -0,0 +1,33 @@
+package com.diagbot.dto;
+
+import io.swagger.models.auth.In;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @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;
+}

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,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @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;
+}

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 id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 提示概念id
+     */
+    private Long conceptId;
+
+    private String conceptName;
+
+
+    private String libTypeName;
+    /**
+     * 描述
+     */
+    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;
+}

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/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/RuleDTO.java

@@ -0,0 +1,39 @@
+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 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 Double 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/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,200 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+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/ResultOtherLis.java

@@ -76,12 +76,13 @@ public class ResultOtherLis implements Serializable {
     /**
      * 其他开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语））", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语））", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
      * 其他开单项名称-细项（医院端）
      */
+    @Excel(name = "实验室检查名称（医院术语））", width = 40, orderNum = "4")
     private String otherItemHisDetailName;
 
     /**
@@ -92,19 +93,19 @@ public class ResultOtherLis implements Serializable {
     /**
      * 提醒项类型
      */
-    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "6")
     private String remindItemType;
 
     /**
      * 提醒项名称
      */
-    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "7")
     private String remindItemName;
 
     /**
      * 提醒项名称（医院端）
      */
-    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "8")
     private String remindItemHisName;
 
     /**
@@ -115,7 +116,7 @@ public class ResultOtherLis implements Serializable {
     /**
      * 输入值
      */
-    @Excel(name = "实验室检查数值", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查数值", width = 40, orderNum = "5")
     private String inputValue;
 
     /**

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

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * <p>
@@ -70,13 +71,13 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 其他开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语）", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
      * 其他开单项名称-细项（医院端）
      */
-    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "4")
     private String otherItemHisDetailName;
 
     /**
@@ -420,4 +421,45 @@ public class ResultOtherTransfusion implements Serializable {
                 ", inputParams=" + inputParams +
                 "}";
     }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        ResultOtherTransfusion resultOtherTransfusion = (ResultOtherTransfusion) o;
+        return Objects.equals(id, resultOtherTransfusion.id)
+                && Objects.equals(isDeleted, resultOtherTransfusion.isDeleted)
+                && Objects.equals(resultId, resultOtherTransfusion.resultId)
+                && Objects.equals(otherItemName, resultOtherTransfusion.otherItemName)
+                && Objects.equals(otherItemHisName, resultOtherTransfusion.otherItemHisName)
+                && Objects.equals(otherItemHisDetailName, resultOtherTransfusion.otherItemHisDetailName)
+                && Objects.equals(otherItemRange, resultOtherTransfusion.otherItemRange)
+                && Objects.equals(otherItemMaxValue, resultOtherTransfusion.otherItemMaxValue)
+                && Objects.equals(otherItemMinValue, resultOtherTransfusion.otherItemMinValue)
+                && Objects.equals(otherItemUnit, resultOtherTransfusion.otherItemUnit)
+                && Objects.equals(otherItemInputValue, resultOtherTransfusion.otherItemInputValue)
+                && Objects.equals(transfusionType, resultOtherTransfusion.transfusionType)
+                && Objects.equals(transfusionTypeHisName, resultOtherTransfusion.transfusionTypeHisName)
+                && Objects.equals(conflictItemType, resultOtherTransfusion.conflictItemType)
+                && Objects.equals(conflictItemName, resultOtherTransfusion.conflictItemName)
+                && Objects.equals(conflictItemHisName, resultOtherTransfusion.conflictItemHisName)
+                && Objects.equals(conflictItemHisDetailName, resultOtherTransfusion.conflictItemHisDetailName)
+                && Objects.equals(referenceValue, resultOtherTransfusion.referenceValue)
+                && Objects.equals(output, resultOtherTransfusion.output)
+                && Objects.equals(expectedOutput, resultOtherTransfusion.expectedOutput)
+                && Objects.equals(success, resultOtherTransfusion.success)
+                && Objects.equals(message, resultOtherTransfusion.message)
+                && Objects.equals(inputParams, resultOtherTransfusion.inputParams);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, isDeleted, resultId, otherItemName, otherItemHisName, otherItemHisDetailName,
+                otherItemRange, otherItemMaxValue, otherItemMinValue, otherItemUnit, otherItemInputValue,
+                transfusionType, transfusionTypeHisName, conflictItemType, conflictItemName, conflictItemHisName,
+                conflictItemHisDetailName, referenceValue, output, expectedOutput, success, message, inputParams);
+    }
 }

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

@@ -0,0 +1,478 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-09
+ */
+@TableName("test_result_rule")
+public class ResultRule 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 resultId;
+
+    /**
+     * 规则类型（1：开单-通用，2：开单-输血，3：危急值-检验，4：危急值-检查，5：高危药品，6：高危手术，7：其他值提醒-检验，8-其他值提醒-检查，9-其他值提醒-输血，10：正常项目重复开立）
+     */
+    private Integer ruleType;
+
+    /**
+     * 开单项类型（编码）
+     */
+    private Integer ruleLibType;
+
+    /**
+     * 开单项类型（名称）
+     */
+    private String ruleLibTypeName;
+
+    /**
+     * 开单项名称
+     */
+    private String ruleLibName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    private String ruleHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    private String ruleHisDetailName;
+
+    /**
+     * 是否有子条件（0：无，1：有）
+     */
+    private Integer hasSubCond;
+
+    /**
+     * 规则组别
+     */
+    private Integer groupType;
+
+    /**
+     * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
+     */
+    private Integer ruleBaseType;
+
+    /**
+     * 禁忌项类型（编码）
+     */
+    private Integer ruleBaseLibType;
+
+    /**
+     * 禁忌项类型（名称）
+     */
+    private String ruleBaseLibTypeName;
+
+    /**
+     * 禁忌项名称
+     */
+    private String ruleBaseLibName;
+
+    /**
+     * 禁忌项名称（医院端）
+     */
+    private String ruleBaseHisName;
+
+    /**
+     * 禁忌项名称-细项（医院端）
+     */
+    private String ruleBaseHisDetailName;
+
+    /**
+     * 禁忌项参考值（最大值）
+     */
+    private BigDecimal ruleBaseMaxValue;
+
+    /**
+     * 禁忌项参考值（最小值）
+     */
+    private BigDecimal ruleBaseMinValue;
+
+    /**
+     * 禁忌项单位
+     */
+    private String ruleBaseUnit;
+
+    /**
+     * 禁忌项输入值（文本/数值）
+     */
+    private String ruleBaseInputValue;
+
+    /**
+     * 参考值（参考范围拼接/药品分类保存）
+     */
+    private String referenceValue;
+
+    /**
+     * 实际输出结果（提醒文本）
+     */
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+
+    /**
+     * 模拟出参
+     */
+    private String outputParams;
+
+    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 Integer getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(Integer ruleType) {
+        this.ruleType = ruleType;
+    }
+
+    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 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;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultRule{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", resultId=" + resultId +
+                ", ruleType=" + ruleType +
+                ", ruleLibType=" + ruleLibType +
+                ", ruleLibTypeName=" + ruleLibTypeName +
+                ", ruleLibName=" + ruleLibName +
+                ", ruleHisName=" + ruleHisName +
+                ", ruleHisDetailName=" + ruleHisDetailName +
+                ", hasSubCond=" + hasSubCond +
+                ", 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 +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/enums/LexiconEnum.java

@@ -0,0 +1,102 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/2/24 10:46
+ */
+public enum LexiconEnum implements KeyedNamed {
+
+    Disease(100,"疾病"),
+    Medicine(101,"药品通用名"),
+    Form(102,"药品剂型"),
+    Symptom(103,"症状"),
+    Vital(104,"体格检查项目"),
+    VitalResult(105,"体格检查结果"),
+    Operation(106,"手术和操作"),
+    LisName(107,"实验室检查套餐"),
+    LisSubName(108,"实验室检查子项目"),
+    PacsName(109,"辅助检查项目"),
+    PacsSubName(110,"辅助检查子项目"),
+    PacsDescribe(111,"辅助检查描述"),
+    PacsResult(112,"辅助检查结果"),
+    Transfusion(113,"输血类型"),
+    Anesthesia(114,"麻醉"),
+    Dept(115,"科室"),
+    Gender(116,"性别"),
+    Group(117,"人群"),
+    Food(118,"食物"),
+    Allergen(119,"其他过敏原"),
+    Device(120,"医疗器械及物品"),
+    AdministrationRoute(121,"给药途径"),
+    Part(122,"部位"),
+    Nurse(123,"护理"),
+    Scale(124,"量表"),
+    Unit(125,"单位"),
+    ICD10Class(300,"ICD10疾病类别"),
+    MedChemClass(301,"药品化学物质类别"),
+    MedZhiLiaoClass(302,"药品治疗学类别"),
+    MedYaoLiClass(303,"药品药理学类别"),
+    MedJiePouClass(304,"药品解剖学类别"),
+    SymptomClass(305,"症状类别"),
+    OperationClass(306,"手术和操作类别"),
+    ICD10ClassNode(400,"ICD10疾病类别根节点"),
+    DeptDiseaseNode(401,"科室疾病类别根节点"),
+    MedChemClassNode(402,"药品化学物质类别根节点"),
+    MedZhiLiaoClassNode(403,"药品治疗学类别根节点"),
+    MedYaoLiClassNode(404,"药品药理学类别根节点"),
+    MedJiePouClassNode(405,"药品解剖学类别根节点"),
+    SymptomClassNode(406,"症状类别根节点"),
+    OperationClassNode(407,"手术和操作类别根节点"),
+    LisClassNode(408,"实验室检查类别根节点"),
+    PacsClassNode(409,"辅助检查类别根节点"),
+    Age(410,"年龄");
+
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    LexiconEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static LexiconEnum getEnum(int key) {
+        for (LexiconEnum item : LexiconEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static LexiconEnum getEnum(String value) {
+        for (LexiconEnum item : LexiconEnum.values()) {
+            if (item.getName().equals(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        LexiconEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

cdssman-service/src/main/java/com/diagbot/enums/RuleBaseTypeEnum.java

@@ -0,0 +1,62 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/4 13:21
+ */
+public enum RuleBaseTypeEnum implements KeyedNamed {
+    Eq(1, "开单外等于术语本身"),
+    Compare(2, "开单外存在比较"),
+    Ne(3, "开单外不等于术语本身"),
+    Allergen(4, "过敏原"),
+    BillItem(5, "开单项"),
+    Regex(6, "检查结果正则表达式");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    RuleBaseTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static RuleBaseTypeEnum getEnum(int key) {
+        for (RuleBaseTypeEnum item : RuleBaseTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static RuleBaseTypeEnum getEnum(String value) {
+        for (RuleBaseTypeEnum item : RuleBaseTypeEnum.values()) {
+            if (item.getName().equals(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        RuleBaseTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

cdssman-service/src/main/java/com/diagbot/enums/YesNoEnum.java

@@ -0,0 +1,63 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 是否枚举
+ * @author: gaodm
+ * @time: 2021/3/2 13:42
+ */
+public enum YesNoEnum implements KeyedNamed {
+    No(0, "否"),
+    Yes(1, "是");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    YesNoEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static YesNoEnum getEnum(int key) {
+        for (YesNoEnum item : YesNoEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static YesNoEnum getEnum(String name) {
+        for (YesNoEnum item : YesNoEnum.values()) {
+            if (item.name.equals(name)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        YesNoEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    public static Integer getKey(String name) {
+        YesNoEnum item = getEnum(name);
+        return item != null ? item.key : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -539,7 +539,7 @@ public class DrugConfigFacade {
         for (Map.Entry<String, List<DrugConfig>> entry : hisNameMap.entrySet()) {
             if (ListUtil.isNotEmpty(entry.getValue())) {
                 retMap.put(entry.getKey(),
-                        EntityUtil.makeMapWithKeyValue(records, "uniqueName", "id"));
+                        EntityUtil.makeMapWithKeyValue(entry.getValue(), "uniqueName", "id"));
             }
         }
         return retMap;
@@ -579,7 +579,7 @@ public class DrugConfigFacade {
         for (Map.Entry<String, List<DrugConfig>> entry : uniqueNameMap.entrySet()) {
             if (ListUtil.isNotEmpty(entry.getValue())) {
                 retMap.put(entry.getKey(),
-                        EntityUtil.makeMapWithKeyValue(records, "hisName", "id"));
+                        EntityUtil.makeMapWithKeyValue(entry.getValue(), "hisName", "id"));
             }
         }
         return retMap;

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -0,0 +1,310 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.GetAllForRelationDTO;
+import com.diagbot.dto.KlConceptAllDTO;
+import com.diagbot.dto.KlConceptInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.KlConcept;
+import com.diagbot.entity.KlConceptCommon;
+import com.diagbot.entity.KlDisease;
+import com.diagbot.entity.KlLibraryInfo;
+import com.diagbot.entity.KlLis;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.KlConceptCommonService;
+import com.diagbot.service.KlDiseaseService;
+import com.diagbot.service.KlLisService;
+import com.diagbot.service.impl.KlConceptServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.GetAllForRelationVO;
+import com.diagbot.vo.KlConceptAllVO;
+import com.diagbot.vo.KlConceptInfoVO;
+import com.diagbot.vo.KlConceptSaveSubVO;
+import com.diagbot.vo.KlConceptSaveVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-01 13:21
+ */
+@Component
+public class KlConceptFacade extends KlConceptServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
+    @Autowired
+    private KlLibraryInfoFacade klLibraryInfoFacade;
+    @Autowired
+    private KlConceptCommonService klConceptCommonService;
+    @Autowired
+    KlLisService klLisService;
+    @Autowired
+    KlDiseaseFacade klDiseaseFacade;
+
+    /**
+     * @param klConceptInfoVO
+     * @return
+     */
+    public IPage<KlConceptInfoDTO> getConceptInfoPage(KlConceptInfoVO klConceptInfoVO) {
+        IPage<KlConceptInfoDTO> conceptPage = getConceptPage(klConceptInfoVO);
+        List<String> userIds = conceptPage.getRecords().stream()
+                .map(i -> i.getModifierId()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        conceptPage.getRecords().forEach(i -> {
+            i.setModifierName(respDTO.data.get(i.getModifierId()));
+        });
+        return conceptPage;
+    }
+
+    /**
+     * @param klConceptAllVO
+     * @return
+     */
+    public List<KlConceptAllDTO> getConceptAlls(KlConceptAllVO klConceptAllVO) {
+        return getConceptAll(klConceptAllVO);
+    }
+
+    /**
+     * @param klConceptSaveVO
+     * @return
+     */
+    public Boolean saveConceptInfo(KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        boolean res = false;
+        // 校验名称是否相同
+        int count = this.count(new QueryWrapper<KlConcept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_type", klConceptSaveVO.getLibType())
+                .eq("lib_name", klConceptSaveVO.getLibName())
+                .ne("id", klConceptSaveVO.getConceptId() == null ? -1 : klConceptSaveVO.getConceptId()));
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该基础术语名称已存在");
+        }
+        //校验
+        KlConceptSaveSubVO paesubVO = new KlConceptSaveSubVO();
+        paesubVO.setConceptId(klConceptSaveVO.getConceptId());
+        paesubVO.setIsConcept(klConceptSaveVO.getIsConcept());
+        paesubVO.setLibId(klConceptSaveVO.getLibId());
+        paesubVO.setSynonymName(klConceptSaveVO.getSynonymName());
+        klLibraryInfoFacade.checkLibraryInfoData(paesubVO);
+        //先判断是新加的,还是修改
+        if (null != klConceptSaveVO.getConceptId() && null != klConceptSaveVO.getLibId()) {
+            //更新标准词
+            res = updateAll(klConceptSaveVO);
+            //更新同义词
+            List<KlConceptSaveSubVO> klConceptAllSub = klConceptSaveVO.getKlConceptSub();
+            if (klConceptAllSub.size() > 0) {
+                for (KlConceptSaveSubVO subVO : klConceptAllSub) {
+                    if (subVO.getLibId() == null) {
+                        //校验
+                        klLibraryInfoFacade.checkLibraryInfoData(subVO);
+                        //保存LibraryInfo
+                        res = klLibraryInfoFacade.savekLibraryInfoData(subVO);
+                    } else {
+                        UpdateWrapper<KlLibraryInfo> klLibraryInfoQuerySub = new UpdateWrapper<>();
+                        klLibraryInfoQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .eq("id", klConceptSaveVO.getLibId())
+                                .set("gmt_modified", now)
+                                .set("modifier", UserUtils.getCurrentPrincipleID())
+                                .set("name", klConceptSaveVO.getLibName())
+                                .set("spell", klConceptSaveVO.getLibName())
+                                .set("remark", klConceptSaveVO.getLibName());
+                        res = klLibraryInfoFacade.update(new KlLibraryInfo(), klLibraryInfoQuerySub);
+                    }
+                }
+            }
+        } else {
+            //保存新数据
+            //1.先保存标准词，生成conceptId
+            KlConcept klConceptPare = new KlConcept();
+            klConceptPare.setLibName(klConceptSaveVO.getLibName());
+            klConceptPare.setLibType(klConceptSaveVO.getLibType());
+            klConceptPare.setStatus(klConceptSaveVO.getStatus());
+            res = save(klConceptPare);
+            if (res) {
+                //2.再把标准词d的conceptId保存到kl_library_info表 生成libId，
+                Long conceptId = klConceptPare.getId();
+                KlLibraryInfo klLibraryInfoSub = new KlLibraryInfo();
+                klLibraryInfoSub.setConceptId(conceptId);
+                klLibraryInfoSub.setName(klConceptSaveVO.getSynonymName());
+                klLibraryInfoSub.setSpell(klConceptSaveVO.getSpell());
+                klLibraryInfoSub.setIsConcept(klConceptSaveVO.getIsConcept());
+                klLibraryInfoSub.setRemark(klConceptSaveVO.getRemark());
+                res = klLibraryInfoFacade.save(klLibraryInfoSub);
+                if (res) {
+                    //3.最后更新回concept表里得lid_id字段
+                    UpdateWrapper<KlConcept> klConceptQuerySub = new UpdateWrapper<>();
+                    klConceptQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("id", klConceptSaveVO.getConceptId())
+                            .set("lib_Id", klLibraryInfoSub.getId());
+                    res = update(new KlConcept(), klConceptQuerySub);
+                }
+            }
+            //KlConceptCommon
+            if (klConceptSaveVO.getIsHasCommon().equals(1)) {
+                KlConceptCommon conceptCommon = new KlConceptCommon();
+                conceptCommon.setSexType(klConceptSaveVO.getSexType());
+                conceptCommon.setMaxAge(klConceptSaveVO.getMaxAge());
+                conceptCommon.setMinAge(klConceptSaveVO.getMinAge());
+                conceptCommon.setConceptId(klConceptPare.getId());
+                klConceptCommonService.save(conceptCommon);
+            }
+            //更新kl_disease
+            KlDisease kllDiseaseSub = new KlDisease();
+            kllDiseaseSub.setConceptId(klConceptPare.getId());
+            kllDiseaseSub.setGmtModified(now);
+            kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+            kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+            res = klDiseaseFacade.saveOrUpdate(kllDiseaseSub);
+            //更新kl_lis
+            KlLis klLisSub = new KlLis();
+            klLisSub.setConceptId(klConceptPare.getId());
+            klLisSub.setGmtModified(now);
+            klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
+            klLisSub.setMinValue(klConceptSaveVO.getMinVal());
+            klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+            klLisSub.setType(klConceptSaveVO.getScopeType());
+            res = klLisService.saveOrUpdate(klLisSub);
+            //增加
+            List<KlConceptSaveSubVO> klConceptSub = klConceptSaveVO.getKlConceptSub();
+            for (KlConceptSaveSubVO subVO : klConceptSub) {
+                if (subVO.getLibId() == null) {
+
+                    klLibraryInfoFacade.checkLibraryInfoData(subVO);
+
+                    res = klLibraryInfoFacade.savekLibraryInfoData(subVO);
+                }
+            }
+
+        }
+        return res;
+    }
+
+    public Boolean updateAll(KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        boolean res = false;
+        UpdateWrapper<KlConcept> klConceptQuerySub = new UpdateWrapper<>();
+        klConceptQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", klConceptSaveVO.getConceptId())
+                .set("gmt_modified", now)
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("lib_name", klConceptSaveVO.getLibName());
+        res = update(new KlConcept(), klConceptQuerySub);
+
+        UpdateWrapper<KlLibraryInfo> klLibraryInfoQuerySub = new UpdateWrapper<>();
+        klLibraryInfoQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", klConceptSaveVO.getLibId())
+                .set("gmt_modified", now)
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("name", klConceptSaveVO.getLibName())
+                .set("spell", klConceptSaveVO.getLibName())
+                .set("remark", klConceptSaveVO.getLibName());
+
+        res = klLibraryInfoFacade.update(new KlLibraryInfo(), klLibraryInfoQuerySub);
+        //更新kl_concept_common表
+        if (klConceptSaveVO.getIsHasCommon().equals(1)) {
+            UpdateWrapper<KlConceptCommon> klConceptCommonQuerySub = new UpdateWrapper<>();
+            klConceptCommonQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("concept_id", klConceptSaveVO.getConceptId())
+                    .set("gmt_modified", now)
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("sex_type", klConceptSaveVO.getLibName())
+                    .set("min_age", klConceptSaveVO.getLibName())
+                    .set("max_age", klConceptSaveVO.getLibName());
+            KlConceptCommon klConceptCommonSub = new KlConceptCommon();
+            klConceptCommonSub.setConceptId(klConceptSaveVO.getConceptId());
+            klConceptCommonSub.setMaxAge(klConceptSaveVO.getMaxAge());
+            klConceptCommonSub.setMinAge(klConceptSaveVO.getMinAge());
+            klConceptCommonSub.setGmtModified(now);
+            klConceptCommonSub.setModifier(UserUtils.getCurrentPrincipleID());
+            res = klConceptCommonService.saveOrUpdate(klConceptCommonSub);
+        }
+        //更新kl_disease
+        if (klConceptSaveVO.getIcdCode() != null) {
+            KlDisease kllDiseaseSub = new KlDisease();
+            kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
+            kllDiseaseSub.setGmtModified(now);
+            kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+            kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+            res = klDiseaseFacade.saveOrUpdate(kllDiseaseSub);
+        }
+        //更新kl_lis
+        if (klConceptSaveVO.getScopeType() != null) {
+            KlLis klLisSub = new KlLis();
+            klLisSub.setConceptId(klConceptSaveVO.getConceptId());
+            klLisSub.setGmtModified(now);
+            klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
+            klLisSub.setMinValue(klConceptSaveVO.getMinVal());
+            klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+            klLisSub.setType(klConceptSaveVO.getScopeType());
+            res = klLisService.saveOrUpdate(klLisSub);
+        }
+        return res;
+    }
+
+    /**
+     * 获取所有概念(术语关系维护时筛选使用)
+     *
+     * @param getAllForRelationVO
+     * @return
+     */
+    public List<GetAllForRelationDTO> getAllForRelation(GetAllForRelationVO getAllForRelationVO) {
+        List<GetAllForRelationDTO> retList = Lists.newArrayList();
+
+        if (StringUtil.isNotBlank(getAllForRelationVO.getName())
+                || getAllForRelationVO.getTypeId() != null) {
+            List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .like(StringUtil.isNotBlank(getAllForRelationVO.getName()), "lib_name", getAllForRelationVO.getName().trim())
+                    .eq(getAllForRelationVO.getTypeId() != null, "lib_type", getAllForRelationVO.getTypeId())
+                    .notIn(ListUtil.isNotEmpty(getAllForRelationVO.getExcludedConceptIds()), "id", getAllForRelationVO.getExcludedConceptIds())
+            );
+            //            retList = BeanUtil.listCopyTo(conceptList, GetAllForRelationDTO.class);
+            if (ListUtil.isNotEmpty(conceptList)) {
+                retList = conceptList.stream().map(x -> {
+                    GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
+                    getAllForRelationDTO.setConceptId(x.getId());
+                    getAllForRelationDTO.setConceptName(x.getLibName());
+                    getAllForRelationDTO.setConceptNameType(String.valueOf(x.getLibType()));
+                    return getAllForRelationDTO;
+                }).collect(Collectors.toList());
+            }
+
+        }
+        return retList;
+    }
+
+    /**
+     * 筛选符合类型的概念id
+     *
+     * @param libTypeId
+     * @param sourceConceptIds
+     * @return
+     */
+    public List<Long> getCompatibleTypeConceptIds(Long libTypeId, List<Long> sourceConceptIds) {
+        if (libTypeId == null || ListUtil.isEmpty(sourceConceptIds)) {
+            return null;
+        }
+        QueryWrapper<KlConcept> conceptQe = new QueryWrapper<>();
+        conceptQe.in("id", sourceConceptIds);
+        conceptQe.eq("lib_type", libTypeId);
+        return list(conceptQe).stream().map(i -> i.getId()).collect(Collectors.toList());
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -0,0 +1,153 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.KlConceptStaticDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.StaticKnowledgeDTO;
+import com.diagbot.dto.StaticKnowledgeIndexDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.ChangeStatusVO;
+import com.diagbot.vo.IdVO;
+import com.diagbot.vo.KlConceptStaticPageVO;
+import com.diagbot.vo.KlConceptStaticVO;
+import com.diagbot.vo.StaticKnowledgeIndexVO;
+import com.diagbot.vo.StaticKnowledgeVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/2/23 15:41
+ */
+@Component
+public class KlConceptStaticFacade {
+
+    @Autowired
+    private CdssCoreClient cdssCoreClient;
+
+    /**
+     * 静态知识检索
+     *
+     * @param staticKnowledgeIndexVO
+     * @return
+     */
+    public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
+        List<StaticKnowledgeIndexDTO> retList = Lists.newLinkedList();
+
+        RespDTO<List<StaticKnowledgeIndexDTO>> respDTO = cdssCoreClient.staticKnowledgeIndex(staticKnowledgeIndexVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            retList = respDTO.data;
+        }
+
+        if (staticKnowledgeIndexVO.getHasInfo() != null && staticKnowledgeIndexVO.getHasInfo().equals(1)) {
+            retList = retList.stream().filter(i -> i.getStatus().equals(1)).collect(Collectors.toList());
+        }
+        return retList;
+    }
+
+
+    /**
+     * 获取静态知识
+     *
+     * @param staticKnowledgeVO
+     * @return
+     */
+    public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
+        StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
+
+        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(staticKnowledgeVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            staticKnowledgeDTO = respDTO.data;
+        }
+        return staticKnowledgeDTO;
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param klConceptStaticPageVO
+     * @return
+     */
+    public IPage<KlConceptStaticDTO> getPage(KlConceptStaticPageVO klConceptStaticPageVO) {
+        Page<KlConceptStaticDTO> page = null;
+        RespDTO<Page<KlConceptStaticDTO>> respDTO = cdssCoreClient.getPage(klConceptStaticPageVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            page = respDTO.data;
+        }
+        return page;
+    }
+
+    /**
+     * 保存记录（新增or修改）
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    public Boolean saveOrUpdateRecord(KlConceptStaticVO klConceptStaticVO) {
+        String userId = UserUtils.getCurrentPrincipleID();
+        klConceptStaticVO.setUserId(Long.valueOf(userId));
+
+        Boolean success = false;
+        RespDTO<Boolean> respDTO = cdssCoreClient.saveOrUpdateRecord(klConceptStaticVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            success = respDTO.data;
+        }
+        return success;
+    }
+
+    /**
+     * 启用禁用
+     *
+     * @param changeStatusVO
+     * @return
+     */
+    public Boolean changeStatus(ChangeStatusVO changeStatusVO) {
+        String userId = UserUtils.getCurrentPrincipleID();
+        changeStatusVO.setUserId(Long.valueOf(userId));
+
+        Boolean success = false;
+        RespDTO<Boolean> respDTO = cdssCoreClient.changeStatus(changeStatusVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            success = respDTO.data;
+        }
+        return success;
+    }
+
+    /**
+     * 根据术语id获取静态信息
+     *
+     * @param idVO
+     * @return
+     */
+    public KlConceptStaticDTO getRecordById(IdVO idVO) {
+        KlConceptStaticDTO klConceptStaticDTO = new KlConceptStaticDTO();
+        RespDTO<KlConceptStaticDTO> respDTO = cdssCoreClient.getRecordById(idVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            klConceptStaticDTO = respDTO.data;
+        }
+        return klConceptStaticDTO;
+    }
+
+    /**
+     * 是否已存在
+     *
+     * @param klConceptStaticVO
+     * @return
+     */
+    public Boolean isExist(KlConceptStaticVO klConceptStaticVO) {
+        Boolean exist = false;
+        RespDTO<Boolean> respDTO = cdssCoreClient.isExist(klConceptStaticVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            exist = respDTO.data;
+        }
+        return exist;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -0,0 +1,102 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseAllDetailDTO;
+import com.diagbot.dto.DiseaseDetailDTO;
+import com.diagbot.dto.DiseasePageDTO;
+import com.diagbot.dto.DiseaseSubDetailDTO;
+import com.diagbot.entity.KlConcept;
+import com.diagbot.entity.KlLexiconRelationship;
+import com.diagbot.service.KlDiseaseService;
+import com.diagbot.service.KlLexiconRelationshipService;
+import com.diagbot.service.impl.KlDiseaseServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.DiseasePageVO;
+import com.diagbot.vo.GetDiseaseDetailVO;
+import com.google.common.collect.Maps;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-09 15:33
+ */
+@Component
+public class KlDiseaseFacade extends KlDiseaseServiceImpl {
+    @Autowired
+    KlLexiconRelationshipFacade klLexiconRelationshipFacade;
+
+    public IPage<DiseasePageDTO> getDiseasePageAll(DiseasePageVO klConceptInfoVO) {
+        return this.getDiseasePage(klConceptInfoVO);
+    }
+
+
+    public DiseaseDetailDTO getDetail(GetDiseaseDetailVO getDiseaseDetailVO) {
+        DiseaseDetailDTO diseaseDetailDTO = new DiseaseDetailDTO();
+
+        List<Integer> types = getDiseaseDetailVO.getTypes();
+        Map<Integer, String> type_nameMap = klLexiconRelationshipFacade.getTypeNameMap(getDiseaseDetailVO);
+
+        Map<Integer, DiseaseSubDetailDTO> disSubDetailMap = Maps.newHashMap();
+        List<DiseaseAllDetailDTO> diseaseAllDetailDTOS = this.getDiseaseDetail(getDiseaseDetailVO);
+        if (ListUtil.isNotEmpty(diseaseAllDetailDTOS)) {
+            diseaseAllDetailDTOS.forEach(x -> {
+                diseaseDetailDTO.setSid(x.getSid());
+                diseaseDetailDTO.setDisName(x.getDisName());
+                if (disSubDetailMap.containsKey(x.getRid())) {
+                    DiseaseSubDetailDTO diseaseSubDetailDTO = disSubDetailMap.get(x.getRid());
+
+                    diseaseSubDetailDTO.setRid(x.getRid());
+                    diseaseSubDetailDTO.setRname(x.getRname());
+                    List<KlConcept> details = diseaseSubDetailDTO.getDetails();
+                    diseaseSubDetailDTO.setDetails(details);
+                    KlConcept klConcept = new KlConcept();
+                    klConcept.setId(x.getEid());
+                    klConcept.setLibName(x.getItemName());
+                    details.add(klConcept);
+
+                    disSubDetailMap.put(x.getRid(), diseaseSubDetailDTO);
+                } else {
+                    DiseaseSubDetailDTO diseaseSubDetailDTO = new DiseaseSubDetailDTO();
+
+                    diseaseSubDetailDTO.setRid(x.getRid());
+                    diseaseSubDetailDTO.setRname(x.getRname());
+                    List<KlConcept> details = Lists.newArrayList();
+                    diseaseSubDetailDTO.setDetails(details);
+                    KlConcept klConcept = new KlConcept();
+                    klConcept.setId(x.getEid());
+                    klConcept.setLibName(x.getItemName());
+                    details.add(klConcept);
+
+                    disSubDetailMap.put(x.getRid(), diseaseSubDetailDTO);
+                }
+
+            });
+        }
+        List<DiseaseSubDetailDTO> datas = Lists.newArrayList();
+        if (MapUtils.isNotEmpty(disSubDetailMap)) {
+            for (Integer type : types) {
+                if (disSubDetailMap.containsKey(type)) {
+                    datas.add(disSubDetailMap.get(type));
+                } else {
+                    DiseaseSubDetailDTO diseaseSubDetailDTO = new DiseaseSubDetailDTO();
+                    diseaseSubDetailDTO.setRid(type);
+                    diseaseSubDetailDTO.setRname(type_nameMap.get(type));
+                    datas.add(diseaseSubDetailDTO);
+                }
+            }
+
+        }
+        diseaseDetailDTO.setDatas(datas);
+        return diseaseDetailDTO;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlLexiconFacade.java

@@ -0,0 +1,38 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.KlLexiconDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.service.impl.KlLexiconServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.KlLexiconVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:24
+ */
+@Component
+public class KlLexiconFacade extends KlLexiconServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
+
+    public IPage<KlLexiconDTO> getPageFac(KlLexiconVO lexiconVO) {
+        IPage<KlLexiconDTO> iPage = this.getPage(lexiconVO);
+        List<String> userIds = iPage.getRecords().stream()
+                .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        iPage.getRecords().forEach(i -> {
+            i.setOperName(respDTO.data.get(i.getModifier()));
+        });
+        return iPage;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlLexiconRelationshipFacade.java

@@ -0,0 +1,55 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.KlLexiconRelationship;
+import com.diagbot.service.impl.KlLexiconRelationshipServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.GetDiseaseDetailVO;
+import com.diagbot.vo.KlLexiconRelationshipVO;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:24
+ */
+@Component
+public class KlLexiconRelationshipFacade extends KlLexiconRelationshipServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
+
+    public IPage<KlLexiconRelationshipDTO> getPageFac(KlLexiconRelationshipVO klLexiconRelationshipVO) {
+        IPage<KlLexiconRelationshipDTO> iPage = this.getPage(klLexiconRelationshipVO);
+        List<String> userIds = iPage.getRecords().stream()
+                .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        iPage.getRecords().forEach(i -> {
+            i.setOperName(respDTO.data.get(i.getModifier()));
+        });
+        return iPage;
+    }
+
+    public Map<Integer,String> getTypeNameMap(GetDiseaseDetailVO getDiseaseDetailVO){
+        Map<Integer,String> typeNameMap = Maps.newHashMap();
+        List<Integer> types = getDiseaseDetailVO.getTypes();
+        List<KlLexiconRelationship> klLexiconRelationships = this.list(new QueryWrapper<KlLexiconRelationship>()
+                .in("code", types)
+                .eq("is_deleted", "N"));
+        if (ListUtil.isNotEmpty(klLexiconRelationships)) {
+            typeNameMap = klLexiconRelationships.stream().collect(Collectors.toMap(KlLexiconRelationship::getCode, KlLexiconRelationship::getName));
+        }
+        return typeNameMap;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlLibraryInfoFacade.java

@@ -0,0 +1,52 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.KlLibraryInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.KlLibraryInfoServiceImpl;
+import com.diagbot.vo.KlConceptSaveSubVO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-03 17:13
+ */
+@Component
+public class KlLibraryInfoFacade extends KlLibraryInfoServiceImpl {
+
+    /**
+     *
+     * @param subVO
+     */
+    public void checkLibraryInfoData(KlConceptSaveSubVO subVO){
+        //校验
+        int countLib = this.count(new QueryWrapper<KlLibraryInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("concept_id", subVO.getConceptId())
+                .eq("name", subVO.getSynonymName())
+                .eq("type_id", subVO.getTypeId())
+                .ne("id", subVO.getLibId() == null ? -1 : subVO.getLibId()));
+        if (countLib > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该基础术语同义词名称已存在");
+        }
+    }
+
+    /**
+     *
+     * @param subVO
+     * @return
+     */
+    public  Boolean savekLibraryInfoData(KlConceptSaveSubVO subVO){
+
+        KlLibraryInfo klLibraryInfoSub = new KlLibraryInfo();
+        klLibraryInfoSub.setConceptId(subVO.getConceptId());
+        klLibraryInfoSub.setName(subVO.getSynonymName());
+        klLibraryInfoSub.setSpell(subVO.getSpell());
+        klLibraryInfoSub.setIsConcept(subVO.getIsConcept());
+        klLibraryInfoSub.setRemark(subVO.getRemark());
+        return this.save(klLibraryInfoSub);
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlRelationFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlRelationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/3 15:44
+ */
+@Component
+public class KlRelationFacade extends KlRelationServiceImpl {
+}

cdssman-service/src/main/java/com/diagbot/facade/KlRelationOrderFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlRelationOrderServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * 术语顺序业务层
+ * @author kwz
+ * @date 2021/3/4
+ * @time 16:59
+ */
+@Component
+public class KlRelationOrderFacade extends KlRelationOrderServiceImpl {
+}

cdssman-service/src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -0,0 +1,81 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.KlRuleByIdParDTO;
+import com.diagbot.dto.KlRuleInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.KlRuleServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.KlRuleByIdVO;
+import com.diagbot.vo.KlRuleInfoClearVO;
+import com.diagbot.vo.KlRuleInfoSaveVO;
+import com.diagbot.vo.KlRuleInfoVO;
+import com.diagbot.vo.KlRuleSatartOrdisaVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 16:20
+ */
+@Component
+public class KlRuleFacade extends KlRuleServiceImpl {
+    @Autowired
+    CdssCoreClient cdssCoreClient;
+
+    public Page<KlRuleInfoDTO> getKlRuleInfoPage(KlRuleInfoVO klRuleInfoVO) {
+        RespDTO<Page<KlRuleInfoDTO>> klRuleInfoPages = cdssCoreClient.getKlRuleInfoPages(klRuleInfoVO);
+        RespDTOUtil.respNGDeal(klRuleInfoPages, "获取分页获取规则维护列表数据失败");
+        return klRuleInfoPages.data;
+    }
+
+    public KlRuleByIdParDTO getByIdRuleInfos(KlRuleByIdVO klRuleByIdVO) {
+        RespDTO<KlRuleByIdParDTO> byIdRuleInfoAll = cdssCoreClient.getByIdRuleInfoAll(klRuleByIdVO);
+        if (byIdRuleInfoAll == null || !CommonErrorCode.OK.getCode().equals(byIdRuleInfoAll.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取规则详情数据失败");
+        }
+        return byIdRuleInfoAll.data;
+    }
+
+    public Boolean saveRuleInfos(KlRuleInfoSaveVO klRuleInfoSaveVO) {
+        RespDTO<Boolean> booleanRespDTO = cdssCoreClient.saveRuleInfoAll(klRuleInfoSaveVO);
+        if (booleanRespDTO == null || !CommonErrorCode.OK.getCode().equals(booleanRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "保存规则详情数据失败");
+        }
+        return booleanRespDTO.data;
+    }
+
+    public Boolean clearRuleInfos(KlRuleInfoClearVO klRuleInfoClearVO) {
+        RespDTO<Boolean> booleanRespDTO = cdssCoreClient.clearRuleInfoAll(klRuleInfoClearVO);
+        if (booleanRespDTO == null || !CommonErrorCode.OK.getCode().equals(booleanRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "刪除规则详情数据失败");
+        }
+        return booleanRespDTO.data;
+    }
+
+    public Boolean startOrDisableRule(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        RespDTO<Boolean> booleanRespDTO = cdssCoreClient.disableRuleInfos(klRuleSatartOrdisaVO);
+        if (booleanRespDTO == null || !CommonErrorCode.OK.getCode().equals(booleanRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "停用规则失败");
+        }
+        return booleanRespDTO.data;
+    }
+
+    public Boolean startRuleInfos(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        RespDTO<Boolean> booleanRespDTO = cdssCoreClient.startRuleInfos(klRuleSatartOrdisaVO);
+        if (booleanRespDTO == null || !CommonErrorCode.OK.getCode().equals(booleanRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "启用规则失败");
+        }
+        return booleanRespDTO.data;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlRulePlanFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.KlRuleMenuWrapper;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.KlRuleMenuVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-09 15:30
+ */
+@Component
+public class KlRulePlanFacade {
+    @Autowired
+    CdssCoreClient cdssCoreClient;
+
+    public List<KlRuleMenuWrapper> getMenu(KlRuleMenuVO klRuleMenuVO) {
+        RespDTO<List<KlRuleMenuWrapper>> menus = cdssCoreClient.getMenus(klRuleMenuVO);
+        RespDTOUtil.respNGDeal(menus, "获取规则下拉菜单信息数据失败");
+        return menus.data;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/MedSearchDataFacade.java

@@ -0,0 +1,175 @@
+package com.diagbot.facade;
+
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.entity.ResultRule;
+import com.diagbot.enums.LexiconEnum;
+import com.diagbot.enums.RuleBaseTypeEnum;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.Drug;
+import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.ItemExt;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/4 9:57
+ */
+@Component
+public class MedSearchDataFacade {
+    /**
+     * 生成开单合理性入参
+     *
+     * @param result
+     * @return
+     */
+    public IndicationPushVO createBillVO(ResultRule result) {
+        IndicationPushVO indicationPushVO = new IndicationPushVO();
+        indicationPushVO.setAge("20");
+        indicationPushVO.setSex(3);
+        indicationPushVO.setRuleType("2");
+
+        //开单项
+        if (result.getRuleLibType().equals(LexiconEnum.LisName.getKey())) {
+            //检验开单项
+            Lis lis = new Lis();
+            lis.setName(result.getRuleHisName());
+            lis.setUniqueName(result.getRuleLibName());
+            indicationPushVO.getLisOrder().add(lis);
+        }
+        if (result.getRuleLibType().equals(LexiconEnum.PacsName.getKey())
+                || result.getRuleLibType().equals(LexiconEnum.PacsSubName.getKey())) {
+            Pacs pacs = new Pacs();
+            pacs.setName(result.getRuleHisName());
+            pacs.setUniqueName(result.getRuleLibName());
+            indicationPushVO.getPacsOrder().add(pacs);
+        }
+        if (result.getRuleLibType().equals(LexiconEnum.Operation.getKey())) {
+            Item operation = new Item();
+            operation.setName(result.getRuleHisName());
+            operation.setUniqueName(result.getRuleLibName());
+            indicationPushVO.getOperationOrder().add(operation);
+        }
+        if (result.getRuleLibType().equals(LexiconEnum.Medicine.getKey())) {
+            Drug drug = new Drug();
+            drug.setName(result.getRuleHisName());
+            drug.setUniqueName(result.getRuleLibName());
+            indicationPushVO.getDrugOrder().add(drug);
+        }
+        if (result.getRuleLibType().equals(LexiconEnum.Transfusion.getKey())) {
+            ItemExt itemExt = new ItemExt();
+            itemExt.setName(result.getRuleHisName());
+            itemExt.setUniqueName(result.getRuleLibName());
+            indicationPushVO.getTransfusionOrder().add(itemExt);
+        }
+
+        if (result.getRuleBaseLibType().equals(LexiconEnum.Disease.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                Item diag = new Item();
+                diag.setName(result.getRuleBaseHisName());
+                diag.setUniqueName(result.getRuleBaseLibName());
+                indicationPushVO.getDiag().add(diag);
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Medicine.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                indicationPushVO.setSymptom(indicationPushVO.getSymptom() +
+                        (StringUtil.isNotBlank(result.getRuleBaseHisName())
+                                ? ("一直服用" + result.getRuleBaseHisName() + ",")
+                                : ""));
+            } else if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Allergen.getKey())) {
+                indicationPushVO.setPasts(indicationPushVO.getPasts() +
+                        (StringUtil.isNotBlank(result.getRuleBaseHisName())
+                                ? ("对" + result.getRuleBaseHisName() + "过敏,")
+                                : ""));
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Symptom.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                indicationPushVO.setSymptom(indicationPushVO.getSymptom() + result.getRuleBaseLibName() + ",");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Vital.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Compare.getKey())) {
+                indicationPushVO.setVital(result.getRuleBaseLibName() + result.getRuleBaseInputValue()
+                        + (StringUtil.isNotBlank(result.getRuleBaseUnit()) ? result.getRuleBaseUnit() : "")
+                        + ",");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.VitalResult.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                indicationPushVO.setVital(result.getRuleBaseLibName() + result.getRuleBaseInputValue() + ",");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Operation.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                Item operation = new Item();
+                operation.setName(result.getRuleBaseHisName());
+                operation.setUniqueName(result.getRuleBaseLibName());
+                indicationPushVO.getOperation().add(operation);
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.LisSubName.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Compare.getKey())) {
+                Lis lis = new Lis();
+                lis.setName(result.getRuleBaseHisName());
+                lis.setDetailName(result.getRuleBaseHisDetailName());
+                lis.setUniqueName(result.getRuleBaseLibName());
+                lis.setUnits(result.getRuleBaseUnit());
+                if (result.getRuleBaseMinValue() != null || result.getRuleBaseMaxValue() != null) {
+                    lis.setValue(Double.valueOf(result.getRuleBaseInputValue()));
+                } else {
+                    lis.setOtherValue(result.getRuleBaseInputValue());
+                }
+                if (result.getRuleBaseMaxValue() != null) {
+                    lis.setMaxValue(result.getRuleBaseMaxValue().doubleValue());
+                }
+                if (result.getRuleBaseMinValue() != null) {
+                    lis.setMinValue(result.getRuleBaseMinValue().doubleValue());
+                }
+                indicationPushVO.getLis().add(lis);
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.PacsName.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.BillItem.getKey())) {
+                Pacs pacs = new Pacs();
+                pacs.setName(result.getRuleBaseHisName());
+                pacs.setUniqueName(result.getRuleBaseLibName());
+                indicationPushVO.getPacsOrder().add(pacs);
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.PacsResult.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                Pacs pacs = new Pacs();
+                pacs.setDesc(result.getRuleBaseLibName());
+                pacs.setResult(result.getRuleBaseLibName());
+                indicationPushVO.getPacs().add(pacs);
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Gender.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                if (result.getRuleBaseLibName().equals("男")) {
+                    indicationPushVO.setSex(1);
+                } else if (result.getRuleBaseLibName().equals("女")) {
+                    indicationPushVO.setSex(2);
+                } else {
+                    indicationPushVO.setSex(3);
+                }
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Group.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                indicationPushVO.setSymptom(indicationPushVO.getSymptom() +
+                        result.getRuleBaseLibName() +
+                        (result.getRuleBaseInputValue() != null ? result.getRuleBaseInputValue() : "") +
+                        (StringUtil.isNotBlank(result.getRuleBaseUnit()) ? result.getRuleBaseUnit() : "") +
+                        ",");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Allergen.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Allergen.getKey())) {
+                indicationPushVO.setPasts(indicationPushVO.getPasts() + "对" + result.getRuleBaseLibName() + "过敏,");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Device.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {
+                indicationPushVO.setPasts(indicationPushVO.getPasts() + "有" + result.getRuleBaseLibName() + ",");
+            }
+        } else if (result.getRuleBaseLibType().equals(LexiconEnum.Age.getKey())) {
+            if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Compare.getKey())) {
+                indicationPushVO.setAge(result.getRuleBaseInputValue());
+            }
+        }
+        return indicationPushVO;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -0,0 +1,395 @@
+package com.diagbot.facade;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.RelationNameDTO;
+import com.diagbot.dto.RelationNamesDTO;
+import com.diagbot.dto.RelationNodeDTO;
+import com.diagbot.entity.KlConcept;
+import com.diagbot.entity.KlRelation;
+import com.diagbot.entity.KlRelationOrder;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.KlRelationService;
+import com.diagbot.service.impl.KlRelationOrderServiceImpl;
+import com.diagbot.service.impl.KlRelationServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.KlRelationNodeVO;
+import com.diagbot.vo.KlRelationSaveVO;
+import com.diagbot.vo.KlRelationVO;
+import com.diagbot.vo.RelationContactDetailVO;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import io.swagger.models.auth.In;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author kwz
+ * @date 2021/3/3
+ * @time 15:42
+ */
+@Component
+public class RelationContactFacade extends KlRelationServiceImpl {
+    @Autowired
+    private KlConceptFacade klConceptFacade;
+    @Autowired
+    private KlRelationOrderFacade klRelationOrderFacade;
+    @Autowired
+    @Qualifier("klRelationServiceImpl")
+    private KlRelationService klRelationService;
+    @Autowired
+    @Qualifier("klRelationOrderServiceImpl")
+    private KlRelationOrderServiceImpl klRelationOrderServiceImpl;
+
+    public RelationNodeDTO relationContactDetail(RelationContactDetailVO relationContactDetailVO) {
+        RelationNodeDTO relationNodeDTO = new RelationNodeDTO();
+
+        KlConcept klConcept = klConceptFacade.getById(relationContactDetailVO.getConceptId());
+        relationNodeDTO.setConceptId(klConcept.getId());
+        relationNodeDTO.setConceptName(klConcept.getLibName());
+        relationNodeDTO.setIsDeletedConcept(klConcept.getIsDeleted());
+        relationNodeDTO.setConceptTypeId(new Long(klConcept.getLibType()));
+
+        relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(),
+                relationContactDetailVO.getRelationIds(), relationContactDetailVO.getTypeIds(),
+                null, klConcept.getIsDeleted()));
+
+        return relationNodeDTO;
+    }
+
+    public RelationNodeDTO relationContactDetail(KlRelationVO klRelationVO) {
+        RelationNamesDTO relationNamesDTO = new RelationNamesDTO();
+        RelationNodeDTO relationNodeDTO = new RelationNodeDTO();
+        List<RelationNameDTO> relationNameDTOs_first = this.getRelationNameDTOs(klRelationVO.getConceptIds(), klRelationVO.getRelationId());
+
+
+        return relationNodeDTO;
+    }
+
+    /**
+     * 处理关系节点-查询事件
+     *
+     * @param conceptId
+     * @param relationIds
+     * @param typeIds
+     * @param hookConceptIds
+     * @param isDeletedParent
+     * @return
+     */
+    private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId, List<Long> relationIds,
+                                                             List<Long> typeIds, List<Long> hookConceptIds,
+                                                             String isDeletedParent) {
+        if (hookConceptIds == null) {
+            hookConceptIds = new ArrayList<>();
+            hookConceptIds.add(conceptId);
+        }
+
+        Long relationId = null, endTypeId = null;
+        if (ListUtil.isNotEmpty(relationIds)) {
+            relationId = relationIds.remove(0);
+        }
+        if (relationId == null) {
+            relationId = -999999l;
+        }
+        if (ListUtil.isNotEmpty(typeIds)) {
+            endTypeId = typeIds.remove(0);
+        }
+        List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId, endTypeId);
+
+        for (RelationNodeDTO i : relationNodeDTOList) {
+            i.setConceptName(i.getConceptName());
+            i.setParentConceptName(i.getParentConceptName());
+            i.setConceptTypeName(LexiconEnum.getName(i.getConceptTypeId().intValue()));
+            i.setConceptNameType(i.getConceptName() + "(" + LexiconEnum.getName(i.getConceptTypeId().intValue()) + ")");
+            i.setParentConceptTypeName(LexiconEnum.getName(i.getParentConceptTypeId().intValue()));
+            i.setParentConceptNameType(i.getParentConceptName() + "("
+                    + LexiconEnum.getName(i.getParentConceptTypeId().intValue()) + ")");
+            i.setIsDeletedConcept(
+                    isDeletedParent.equals(IsDeleteEnum.Y.getKey()) ? IsDeleteEnum.Y.getKey() : i.getIsDeletedConcept()
+            );
+
+            if (!hookConceptIds.contains(i.getConceptId())) {
+                List<Long> hookConceptIds_ = new ArrayList<>();
+                hookConceptIds_.addAll(hookConceptIds);
+                hookConceptIds_.add(i.getConceptId());
+                i.setNodeList(repairRelationDataForQuery(i.getConceptId(),
+                        Lists.newArrayList(relationIds), Lists.newArrayList(typeIds),
+                        hookConceptIds_, i.getIsDeletedConcept()));
+            }
+        }
+
+        return relationNodeDTOList;
+    }
+    @DS("med")
+    @DSTransactional
+    public Boolean addRelation(List<KlRelationSaveVO> klRelationSaveVOs) {
+        if (ListUtil.isNotEmpty(klRelationSaveVOs)) {
+            KlRelationSaveVO klRelationSaveVO = klRelationSaveVOs.get(0);
+            Long sid = klRelationSaveVO.getSid();
+            List<Long> conceptid = Lists.newArrayList(sid);
+            Integer rid = klRelationSaveVO.getRid();
+            List<Long> sids = new ArrayList<>();
+            List<RelationNameDTO> relationNameDTOs = this.getRelationNameDTOs(conceptid, rid);
+            if (ListUtil.isNotEmpty(relationNameDTOs)) {
+                for (RelationNameDTO red : relationNameDTOs) {
+                    Long startId = red.getStartId();
+                    Long medId = red.getEndId();
+                    if (!sids.contains(startId)) {
+                        sids.add(startId);
+                    }
+                    if (!sids.contains(medId)) {
+                        sids.add(medId);
+                    }
+                }
+            }
+            List<KlRelation> relationList = this.list(new QueryWrapper<KlRelation>()
+                    .in("start_id", sids)
+                    .eq("relation_id", rid));
+            List<Long> ids = relationList.stream().map(x -> x.getId()).collect(Collectors.toList());
+            //先删除
+            if (ListUtil.isNotEmpty(ids)) {
+                this.removeByIds(ids);
+
+                QueryWrapper<KlRelationOrder> relationOrderQe = new QueryWrapper<>();
+                relationOrderQe.in("t_relation_id", ids);
+                klRelationOrderFacade.remove(relationOrderQe);
+            }
+            List<List<KlRelation>> relationGroupList = relationDataForAdd(klRelationSaveVOs);
+
+//            String currentUser = UserUtils.getCurrentPrincipleID();
+            Date now = DateUtil.now();
+            List<KlRelation> relationLists = Lists.newArrayList();
+            relationGroupList.forEach(i -> {
+                i.forEach(j -> {
+//                    j.setCreator(currentUser);
+                    j.setGmtCreate(now);
+//                    j.setModifier(currentUser);
+                    j.setGmtModified(now);
+                    relationLists.add(j);
+                });
+            });
+            klRelationService.saveBatch(relationLists);
+
+            List<KlRelationOrder> relationOrderList = Lists.newArrayList();
+            relationGroupList.forEach(i -> {
+                int orderNo = 0;
+                for (KlRelation j : i) {
+                    orderNo++;
+                    KlRelationOrder relationOrder = new KlRelationOrder();
+                    relationOrder.setOrderNo(orderNo);
+                    relationOrder.settRelationId(j.getId());
+                    relationOrder.setGmtCreate(now);
+                    relationOrder.setGmtModified(now);
+//                    relationOrder.setCreator(currentUser);
+//                    relationOrder.setModifier(currentUser);
+                    relationOrderList.add(relationOrder);
+                }
+            });
+            klRelationOrderServiceImpl.saveBatch(relationOrderList);
+
+        }
+
+        return true;
+    }
+
+    private List<List<KlRelation>> relationDataForAdd(List<KlRelationSaveVO> klRelationSaveVOs) {
+        List<List<KlRelation>> relationList = Lists.newArrayList();
+        Map<String, List<KlRelation>> relationMap = Maps.newHashMap();
+        if (ListUtil.isNotEmpty(klRelationSaveVOs)) {
+
+            for (KlRelationSaveVO kls : klRelationSaveVOs) {
+                Long sid = kls.getSid();
+                Integer rid = kls.getRid();
+                Long eid = kls.getEid();
+                Integer srid = kls.getSrid();
+                List<Long> eids = kls.getEids();
+                if(relationMap.containsKey(sid.toString()+"&"+rid.toString())){
+                    List<KlRelation> klRelations_big = relationMap.get(sid.toString() + "&" + rid.toString());
+                    KlRelation klRelation = new KlRelation();
+                    klRelation.setStartId(sid);
+                    klRelation.setRelationId(rid);
+                    klRelation.setEndId(eid);
+                    klRelation.setStatus(1);
+                    klRelations_big.add(klRelation);
+                    relationMap.put(sid.toString() + "&" + rid.toString(),klRelations_big);
+                }else {
+                    List<KlRelation> klRelations_big = Lists.newArrayList();
+                    KlRelation klRelation = new KlRelation();
+                    klRelation.setStartId(sid);
+                    klRelation.setRelationId(rid);
+                    klRelation.setEndId(eid);
+                    klRelation.setStatus(1);
+                    klRelations_big.add(klRelation);
+                    relationMap.put(sid.toString() + "&" + rid.toString(),klRelations_big);
+                }
+                if(srid != null && ListUtil.isNotEmpty(eids)){
+                    List<KlRelation> klRelations_sub = Lists.newArrayList();
+                    for (Long id:eids) {
+                        KlRelation klRelation = new KlRelation();
+                        klRelation.setStartId(eid);
+                        klRelation.setRelationId(srid);
+                        klRelation.setEndId(id);
+                        klRelation.setStatus(1);
+                        klRelations_sub.add(klRelation);
+                    }
+                    relationMap.put(eid.toString() + "&" + srid.toString(),klRelations_sub);
+                }
+            }
+        }
+        if(MapUtils.isNotEmpty(relationMap)){
+            relationMap.forEach((x,y)->{
+                relationList.add(y);
+            });
+        }
+
+        return relationList;
+    }
+
+    /**
+     * 医学术语关联维护/医学术语多层关联维护-添加或者编辑
+     *
+     * @param klRelationNodeVO
+     * @return
+     */
+    public Boolean addRelation(KlRelationNodeVO klRelationNodeVO) {
+        if (klRelationNodeVO.getConceptId() == null) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "conceptId必填！");
+        }
+        if (ListUtil.isEmpty(klRelationNodeVO.getNodeList())) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "nodeList不能为空！");
+        }
+
+        //先删除
+        List<Long> relationIdList = repairRelationDataForDelBeforeAdd(klRelationNodeVO.getConceptId(), klRelationNodeVO);
+        if (ListUtil.isNotEmpty(relationIdList)) {
+            removeByIds(relationIdList);
+
+            QueryWrapper<KlRelationOrder> relationOrderQe = new QueryWrapper<>();
+            relationOrderQe.in("t_relation_id", relationIdList);
+            klRelationOrderFacade.remove(relationOrderQe);
+        }
+
+        //后添加
+        List<List<KlRelation>> relationGroupList = repairRelationDataForAdd(klRelationNodeVO);
+        String currentUser = UserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
+        List<KlRelation> relationList = Lists.newArrayList();
+        relationGroupList.forEach(i -> {
+            i.forEach(j -> {
+                j.setCreator(currentUser);
+                j.setGmtCreate(now);
+                j.setModifier(currentUser);
+                j.setGmtModified(now);
+                relationList.add(j);
+            });
+        });
+        klRelationService.saveOrUpdateBatch(relationList);
+
+        if (klRelationNodeVO.getIsOrderBy() == 1) {
+            List<KlRelationOrder> relationOrderList = Lists.newArrayList();
+            relationGroupList.forEach(i -> {
+                int orderNo = 0;
+                for (KlRelation j : i) {
+                    orderNo++;
+                    KlRelationOrder relationOrder = new KlRelationOrder();
+                    relationOrder.setOrderNo(orderNo);
+                    relationOrder.settRelationId(j.getId());
+                    relationOrder.setGmtCreate(now);
+                    relationOrder.setGmtModified(now);
+                    relationOrder.setCreator(currentUser);
+                    relationOrder.setModifier(currentUser);
+                    relationOrderList.add(relationOrder);
+                }
+            });
+            klRelationOrderServiceImpl.saveBatch(relationOrderList);
+        }
+
+        return true;
+    }
+
+    /**
+     * 处理关系节点-添加或者编辑前先删除掉
+     *
+     * @param conceptId        当前概念id
+     * @param klRelationNodeVO
+     * @return
+     */
+    private List<Long> repairRelationDataForDelBeforeAdd(Long conceptId, KlRelationNodeVO klRelationNodeVO) {
+        List<Long> relationIdList = Lists.newArrayList();
+        List<KlRelation> relationList = this.list(new QueryWrapper<KlRelation>()
+                .eq("start_id", conceptId)
+                .eq("relation_id", klRelationNodeVO != null && klRelationNodeVO.getSonRelationId() != null ?
+                        klRelationNodeVO.getSonRelationId() : -999999l));
+
+        if (ListUtil.isNotEmpty(relationList)) {
+            if (klRelationNodeVO != null && klRelationNodeVO.getSonTypeId() != null) {
+                List<Long> conceptIdList = klConceptFacade.getCompatibleTypeConceptIds(klRelationNodeVO.getSonTypeId(),
+                        relationList.stream().map(i -> i.getEndId()).collect(Collectors.toList()));
+                if (conceptIdList != null) {
+                    relationList = relationList.stream()
+                            .filter(i -> conceptIdList.contains(i.getEndId())).collect(Collectors.toList());
+                }
+            }
+
+            if (ListUtil.isNotEmpty(relationList)) {
+                relationIdList.addAll(relationList.stream().map(i -> i.getId()).collect(Collectors.toList()));
+
+                Map<Long, KlRelationNodeVO> conceptIdRnMap = Maps.newHashMap();
+                if (klRelationNodeVO != null && ListUtil.isNotEmpty(klRelationNodeVO.getNodeList())) {
+                    conceptIdRnMap = klRelationNodeVO.getNodeList()
+                            .stream().collect(Collectors.toMap(KlRelationNodeVO::getConceptId, i -> i));
+                }
+
+                for (KlRelation i : relationList) {
+                    relationIdList.addAll(repairRelationDataForDelBeforeAdd(i.getEndId(),
+                            conceptIdRnMap.get(i.getEndId())));
+                }
+            }
+        }
+        return relationIdList;
+    }
+
+    /**
+     * 处理关系节点-添加或者编辑事件
+     *
+     * @param klRelationNodeVO
+     * @return
+     */
+    private List<List<KlRelation>> repairRelationDataForAdd(KlRelationNodeVO klRelationNodeVO) {
+        List<List<KlRelation>> retList = Lists.newArrayList();
+
+        if (ListUtil.isNotEmpty(klRelationNodeVO.getNodeList())) {
+            List<KlRelation> relationList = Lists.newArrayList();
+            klRelationNodeVO.getNodeList().forEach(i -> {
+                KlRelation relation = new KlRelation();
+                relation.setStartId(klRelationNodeVO.getConceptId());
+                relation.setEndId(i.getConceptId());
+                relation.setRelationId(Integer.parseInt(String.valueOf(i.getRelationId())));
+                relationList.add(relation);
+
+                if (ListUtil.isNotEmpty(i.getNodeList())) {
+                    retList.addAll(repairRelationDataForAdd(i));
+                }
+            });
+            retList.add(relationList);
+        }
+
+        return retList;
+    }
+
+}

cdssman-service/src/main/java/com/diagbot/facade/ResultRuleFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.ResultRuleServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/9 11:06
+ */
+@Component
+public class ResultRuleFacade extends ResultRuleServiceImpl {
+}

cdssman-service/src/main/java/com/diagbot/facade/RuleTestFacade.java

@@ -29,6 +29,7 @@ import com.diagbot.repository.TransfusionRemindRepository;
 import com.diagbot.repository.TransfusionSuggestRepository;
 import com.diagbot.repository.YiBaoOperationNameRepository;
 import com.diagbot.util.ExcelUtils;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.BillRuleVO;
 import com.diagbot.vo.CriticalRuleVO;
 import com.diagbot.vo.HighriskRuleVO;
@@ -43,6 +44,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -297,6 +299,9 @@ public class RuleTestFacade {
         //输血其他值提醒
         List<TransfusionSuggest> otherRule_transfusion = transfusionSuggestRepository.findByStatus(StatusEnum.Enable.getKey());
 
+        //诊断映射关系
+        Map<String, Map<String, List<Long>>> diseaseConfigMap = diseaseConfigFacade.getUniqueConfigMap(hospitalId, null, null);
+
         Map<String, List<String>> billMap = unUsedMappingFacade.billUsedNames(billRules);
         Map<String, List<String>> billTransfusionMap = unUsedMappingFacade.billTransfusionUsedNames(billRules_transfusion);
         Map<String, List<String>> criticalLisMap = unUsedMappingFacade.criticalLisUsedNames(criticalRules_lis);
@@ -351,7 +356,13 @@ public class RuleTestFacade {
             diseaseNames.addAll(otherLisMap.get("disease"));
         }
         if (otherPacsMap.containsKey("disease")) {
-            diseaseNames.addAll(otherPacsMap.get("disease"));
+            List<String> names = otherPacsMap.get("disease");
+            if (ListUtil.isNotEmpty(names)) {
+                names.forEach(name -> {
+                    diseaseNames.addAll(diseaseConfigMap.keySet().stream().filter(i -> i.contains(name)).collect(Collectors.toList()));
+                });
+            }
+            //diseaseNames.addAll(otherPacsMap.get("disease"));
         }
         if (otherTransfusionMap.containsKey("disease")) {
             diseaseNames.addAll(otherTransfusionMap.get("disease"));
@@ -390,7 +401,7 @@ public class RuleTestFacade {
 
         List<LisConfig> unUsedLisConfigs = unUsedMappingFacade.unUsedMapping(lisConfigList, lisNames);
         List<PacsConfig> unUsedPacsConfigs = unUsedMappingFacade.unUsedMapping(pacsConfigList, pacsNames);
-        List<DiseaseConfig> unUsedDiseaseConfigs = unUsedMappingFacade.unUsedMapping(diseaseConfigList, drugNames);
+        List<DiseaseConfig> unUsedDiseaseConfigs = unUsedMappingFacade.unUsedMapping(diseaseConfigList, diseaseNames);
         List<DrugConfig> unUsedDrugConfigs = unUsedMappingFacade.unUsedMapping(drugConfigList, drugNames);
         List<OperationConfig> unUsedOperationConfig = unUsedMappingFacade.unUsedMapping(operationConfigList, operationNames);
         List<TransfusionConfig> unUsedTransfusionConfigs = unUsedMappingFacade.unUsedMapping(transfusionConfigList, transfusionNames);

cdssman-service/src/main/java/com/diagbot/facade/SearchDataFacade.java

@@ -62,7 +62,7 @@ public class SearchDataFacade {
             operation.setUniqueName(resultBill.getBillItemName());
             indicationPushVO.getOperationOrder().add(operation);
         }
-        if (resultBill.getBillItemType().equals(GraphLabelEnum.MedRegName.getName())) {
+        if (resultBill.getBillItemType().equals(GraphLabelEnum.Medicine.getName())) {
             Drug drug = new Drug();
             drug.setName(resultBill.getBillItemHisName());
             drug.setUniqueName(resultBill.getBillItemName());
@@ -377,12 +377,12 @@ public class SearchDataFacade {
 
         Pacs pacs = new Pacs();
         pacs.setResult(result.getPacsResult());
-        if (StringUtil.isNotBlank(result.getPostoken())) {
+        /*if (StringUtil.isNotBlank(result.getPostoken())) {
             pacs.setResult(pacs.getResult() + "，" + result.getPostoken());
         }
         if (StringUtil.isNotBlank(result.getNegtoken())) {
             pacs.setResult(pacs.getResult() + "，无" + result.getNegtoken());
-        }
+        }*/
         indicationPushVO.getPacs().add(pacs);
 
         if (StringUtil.isNotBlank(result.getGender())) {
@@ -437,16 +437,18 @@ public class SearchDataFacade {
         }
         indicationPushVO.getLis().add(lis);
 
-        if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoOperationName.getName())) {
-            Item item = new Item();
-            item.setName(result.getConflictItemHisName());
-            item.setUniqueName(result.getConflictItemName());
-            indicationPushVO.getOperation().add(item);
-        } else if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoDiseaseName.getName())) {
-            Item item = new Item();
-            item.setName(result.getConflictItemHisName());
-            item.setUniqueName(result.getConflictItemName());
-            indicationPushVO.getDiag().add(item);
+        if (StringUtil.isNotBlank(result.getConflictItemType())) {
+            if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoOperationName.getName())) {
+                Item item = new Item();
+                item.setName(result.getConflictItemHisName());
+                item.setUniqueName(result.getConflictItemName());
+                indicationPushVO.getOperation().add(item);
+            } else if (result.getConflictItemType().equals(GraphLabelEnum.YiBaoDiseaseName.getName())) {
+                Item item = new Item();
+                item.setName(result.getConflictItemHisName());
+                item.setUniqueName(result.getConflictItemName());
+                indicationPushVO.getDiag().add(item);
+            }
         }
         return indicationPushVO;
     }

cdssman-service/src/main/java/com/diagbot/mapper/KlConceptCommonMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlConceptCommon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 概念通用扩展表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptCommonMapper extends BaseMapper<KlConceptCommon> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlConceptDetailMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlConceptDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 静态知识内容表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptDetailMapper extends BaseMapper<KlConceptDetail> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlConceptMapper.java

@@ -0,0 +1,26 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlConceptAllDTO;
+import com.diagbot.dto.KlConceptInfoDTO;
+import com.diagbot.entity.KlConcept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlConceptAllVO;
+import com.diagbot.vo.KlConceptInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 概念表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptMapper extends BaseMapper<KlConcept> {
+
+    IPage<KlConceptInfoDTO> getConceptPage(KlConceptInfoVO klConceptInfoVO);
+
+    List<KlConceptAllDTO> getConceptAll(KlConceptAllVO klConceptAllVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlConceptStaticMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlConceptStatic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 静态知识标准术语表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptStaticMapper extends BaseMapper<KlConceptStatic> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlDictionaryInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlDictionaryInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDictionaryInfoMapper extends BaseMapper<KlDictionaryInfo> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlDiseaseCorrespondingMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlDiseaseCorresponding;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDiseaseCorrespondingMapper extends BaseMapper<KlDiseaseCorresponding> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlDiseaseMapper.java

@@ -0,0 +1,25 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseAllDetailDTO;
+import com.diagbot.dto.DiseasePageDTO;
+import com.diagbot.entity.KlDisease;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.DiseasePageVO;
+import com.diagbot.vo.GetDiseaseDetailVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 疾病表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDiseaseMapper extends BaseMapper<KlDisease> {
+
+    IPage<DiseasePageDTO> getDiseasePage(DiseasePageVO klConceptInfoVO);
+    List<DiseaseAllDetailDTO> getDiseaseAllDetaill(GetDiseaseDetailVO getDiseaseDetailVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlLexiconMapper.java

@@ -0,0 +1,19 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconDTO;
+import com.diagbot.entity.KlLexicon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlLexiconVO;
+
+/**
+ * <p>
+ * 术语分类表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLexiconMapper extends BaseMapper<KlLexicon> {
+    IPage<KlLexiconDTO> getPage(KlLexiconVO lexiconVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlLexiconRelationshipMapper.java

@@ -0,0 +1,19 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
+import com.diagbot.entity.KlLexiconRelationship;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlLexiconRelationshipVO;
+
+/**
+ * <p>
+ * 术语关系分类表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLexiconRelationshipMapper extends BaseMapper<KlLexiconRelationship> {
+    IPage<KlLexiconRelationshipDTO> getPage(KlLexiconRelationshipVO klLexiconRelationshipVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlLibraryInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlLibraryInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 术语表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLibraryInfoMapper extends BaseMapper<KlLibraryInfo> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlLisMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlLis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 概念通用扩展表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLisMapper extends BaseMapper<KlLis> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlRelationMapper.java

@@ -0,0 +1,30 @@
+package com.diagbot.mapper;
+
+import com.diagbot.dto.RelationNameDTO;
+import com.diagbot.dto.RelationNodeDTO;
+import com.diagbot.entity.KlRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlRelationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import com.diagbot.dto.MedClassMedDTO;
+import com.diagbot.entity.KlRelation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 术语关系表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlRelationMapper extends BaseMapper<KlRelation> {
+    List<RelationNodeDTO> getRelationNodeDTOs(@Param(value="conceptId")Long conceptId, @Param(value="relationId")Long relationId, @Param(value="endTypeId")Long endTypeId);
+
+    List<MedClassMedDTO> getMedClassMedList();
+
+    List<RelationNameDTO> getRelationNameDTOs(@Param(value="conceptIds")List<Long> conceptIds,@Param(value="relationId")Integer relationId);
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlRelationOrderMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlRelationOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 术语关系排序表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlRelationOrderMapper extends BaseMapper<KlRelationOrder> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlRuleBaseMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlRuleBase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 规则基础表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public interface KlRuleBaseMapper extends BaseMapper<KlRuleBase> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlRuleConditionMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlRuleCondition;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 规则条件表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public interface KlRuleConditionMapper extends BaseMapper<KlRuleCondition> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlRuleMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.diagbot.dto.RuleDTO;
+import com.diagbot.entity.KlRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.RuleVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 规则信息表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-01
+ */
+public interface KlRuleMapper extends BaseMapper<KlRule> {
+    List<RuleDTO> getRules(RuleVO ruleVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/ResultRuleMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ResultRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2021-03-09
+ */
+public interface ResultRuleMapper extends BaseMapper<ResultRule> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlConceptCommon;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 概念通用扩展表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptCommonService extends IService<KlConceptCommon> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlConceptDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 静态知识内容表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptDetailService extends IService<KlConceptDetail> {
+
+}

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

@@ -0,0 +1,24 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlConceptAllDTO;
+import com.diagbot.dto.KlConceptInfoDTO;
+import com.diagbot.entity.KlConcept;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlConceptAllVO;
+import com.diagbot.vo.KlConceptInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 概念表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptService extends IService<KlConcept> {
+    public IPage<KlConceptInfoDTO> getConceptPage(KlConceptInfoVO klConceptInfoVO);
+    public List<KlConceptAllDTO> getConceptAll(KlConceptAllVO klConceptAllVO);
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlConceptStatic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 静态知识标准术语表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlConceptStaticService extends IService<KlConceptStatic> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlDictionaryInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDictionaryInfoService extends IService<KlDictionaryInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlDiseaseCorresponding;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDiseaseCorrespondingService extends IService<KlDiseaseCorresponding> {
+
+}

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

@@ -0,0 +1,26 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseAllDetailDTO;
+import com.diagbot.dto.DiseasePageDTO;
+import com.diagbot.entity.KlDisease;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.DiseasePageVO;
+import com.diagbot.vo.GetDiseaseDetailVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 疾病表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlDiseaseService extends IService<KlDisease> {
+    IPage<DiseasePageDTO> getDiseasePage(DiseasePageVO klConceptInfoVO);
+
+    List<DiseaseAllDetailDTO> getDiseaseDetail(GetDiseaseDetailVO getDiseaseDetailVO);
+}
+

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

@@ -0,0 +1,19 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
+import com.diagbot.entity.KlLexiconRelationship;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlLexiconRelationshipVO;
+
+/**
+ * <p>
+ * 术语关系分类表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLexiconRelationshipService extends IService<KlLexiconRelationship> {
+    IPage<KlLexiconRelationshipDTO> getPage(KlLexiconRelationshipVO klLexiconRelationshipVO);
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconDTO;
+import com.diagbot.entity.KlLexicon;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlLexiconVO;
+
+/**
+ * <p>
+ * 术语分类表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLexiconService extends IService<KlLexicon> {
+    IPage<KlLexiconDTO> getPage(KlLexiconVO lexiconVO);
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlLibraryInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 术语表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLibraryInfoService extends IService<KlLibraryInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlLis;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 概念通用扩展表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2021-03-01
+ */
+public interface KlLisService extends IService<KlLis> {
+
+}