Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

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

@@ -32,15 +32,15 @@ public class CacheDeleteInit implements CommandLineRunner {
         cacheFacade.loadDrugTypeCache();
         log.info("CDSS-CORE服务启动加载药品类型对应关系缓存成功！");
 
-//        cacheFacade.getDiseaseCorrespondCache();
-//        log.info("CDSS-CORE服务启动加载疾病对应ICD10缓存成功！");
-//
-//        cacheFacade.getdiseaseFilterCache();
-//        log.info("CDSS-CORE服务启动加载疾病过滤缓存成功！");
-//
-//        cacheFacade.loadAllRuleCache();
-//        log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
-//
+        cacheFacade.getDiseaseCorrespondCache();
+        log.info("CDSS-CORE服务启动加载疾病对应ICD10缓存成功！");
+
+        cacheFacade.getdiseaseFilterCache();
+        log.info("CDSS-CORE服务启动加载疾病过滤缓存成功！");
+
+        cacheFacade.loadAllRuleCache();
+        log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
+
         //无用的缓存
         //
         //        cacheFacade.getSymptomCache();

src/main/resources/mapper/KlConceptMapper.xml

@@ -396,7 +396,6 @@
 					AND f.conceptId IS NULL
 				</when>
 				<when test="hasInfo==1">
-					-- AND f.STATUS = 1
 					AND f.conceptId IS NOT NULL
 				</when>
 			</choose>