诊断依据导入

doc/008.20210629诊断依据基础表扩展/med_2021.sql

@@ -9,7 +9,8 @@ CREATE TABLE `kl_diagnose_base_relation` (
   `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
   `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `diagnose_base_id` bigint(20) NOT NULL COMMENT 'diagnose_base_id',
-	`concept_id` bigint(20) NOT NULL COMMENT 'concept_id',
-  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='基础规则关联表';
+  `concept_id` bigint(20) NOT NULL COMMENT 'concept_id',
+  PRIMARY KEY (`id`),
+  KEY `diagnose_base_id` (`diagnose_base_id`),
+  KEY `concept_id` (`concept_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='基础规则关联表';

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

@@ -48,8 +48,8 @@ public class CacheDeleteInit implements CommandLineRunner {
         cacheFacade.loadDeptPush();
         log.info("CDSS-CORE服务启动加载科室和推送映射成功！");
 
-        // cacheFacade.loadAllRuleCache();
-        // log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
+        cacheFacade.loadAllRuleCache();
+        log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
 
         cacheFacade.loadAllBaseDiagnoseCache();
         log.info("CDSS-CORE服务启动加载诊断依据缓存成功！");

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

@@ -36,7 +36,7 @@ public class ExportDiagnoseDTO implements Serializable {
     private String maxSymbol;
     @Excel(name="单位", width = 10, orderNum = "90")
     private String minSymbol;
-    @Excel(name="关联词", width = 30, orderNum = "35")
+    @Excel(name="关联词", width = 30, orderNum = "25")
     private String relation;
 
 }

src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.entity.KlDiagnoseCondition;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.KlDiagnoseBaseRelationService;
 import com.diagbot.service.impl.KlDiagnoseServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
@@ -29,6 +30,7 @@ import com.diagbot.vo.KlDiagnoseSatarDisVO;
 import com.diagbot.vo.KlDiagnoseSaveVO;
 import com.diagbot.vo.KlDiagnoseTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -51,7 +53,8 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
     @Autowired
     KlDictionaryInfoFacade klDictionaryInfoFacade;
     @Autowired
-    KlDiagnoseBaseRelationFacade klDiagnoseBaseRelationFacade;
+    @Qualifier("klDiagnoseBaseRelationServiceImpl")
+    KlDiagnoseBaseRelationService klDiagnoseBaseRelationService;
 
 
     public IPage<KlDiagnoseInfoDTO> getKlDiagnoseInfoPage(KlDiagnoseInfoVO klDiagnoseInfoVO) {
@@ -216,7 +219,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
             res = klDiagnoseBaseFacade.remove(klDiagnoseBaseQuery);
 
             // 删除kl_diagnose_base_relation
-            klDiagnoseBaseRelationFacade.remove(new QueryWrapper<KlDiagnoseBaseRelation>()
+            klDiagnoseBaseRelationService.remove(new QueryWrapper<KlDiagnoseBaseRelation>()
                     .in("diagnose_base_id", baseId));
         }
         //删除kl_rule_condition表的数据
@@ -277,6 +280,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                                         baseRelation.setGmtModified(now);
                                         klDiagnoseBaseRelationList.add(baseRelation);
                                     }
+                                    klDiagnoseBaseRelationService.saveBatch(klDiagnoseBaseRelationList);
                                 }
                                 if (res) {
                                     KlDiagnoseCondition klDiagnoseConditionBase = new KlDiagnoseCondition();