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

docs/017.20190911知识库疾病科室分类维护/init_med.sql

@@ -1,2 +1,4 @@
 -- 知识库诊断设置科室和疾病分类
-use `med`;
+use `med`;
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅰ', 'Ⅰ', '1', '1', '疾病分级-Ⅰ级');
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅱ', 'Ⅱ', '1', '2', '疾病分级-Ⅱ级');

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,17 +1,15 @@
 package com.diagbot.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
 import com.diagbot.enums.DisclaimerCodeEnum;
-import com.diagbot.enums.DiseaseClassifyEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.PositionTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 枚举数据接口是实现类
@@ -33,12 +31,11 @@ public class EnumsDataServiceImpl implements EnumsDataService {
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
                 .addEnums("lexiconRSTypeEnum", LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
                 .addEnums("lexiconTypeEnum", LexiconTypeEnum.values())
-                .addEnums("concatLexiconTypeEnum", 
+                .addEnums("concatLexiconTypeEnum",
                 		LexiconTypeEnum.SYMPTOM,LexiconTypeEnum.BODYPART,LexiconTypeEnum.LIS_PACKAGE,LexiconTypeEnum.PACS_PACKAGE,
                 		LexiconTypeEnum.PACS_ITEMS,LexiconTypeEnum.DIAGNOSIS,LexiconTypeEnum.PACS_CATEGORY_BIG,LexiconTypeEnum.PACS_CATEGORY_SMALL,
                 		LexiconTypeEnum.DEPARTMENT,LexiconTypeEnum.GAUGE,LexiconTypeEnum.SIDE_EFFECTS,LexiconTypeEnum.CORE_INDICATORS,
                 		LexiconTypeEnum.LIS_TABLES)
-                .addEnums("diseaseClassifyEnum", DiseaseClassifyEnum.LevelFirst,DiseaseClassifyEnum.LevelSecond)
                 .build();
         return enumMap;
     }

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -137,7 +137,7 @@ public class ConceptController {
             notes = "type: 1:科室、2:辅检、3:慢病")
     @PostMapping("/getConceptListByType")
     @SysLogger("getConceptListByType")
-    @ApiIgnore
+//    @ApiIgnore
     public RespDTO<List<ConceptBaseDTO>> getConceptListByType(@RequestBody ConceptTypeVO conceptTypeVO) {
         return RespDTO.onSuc(conceptFacade.getConceptListByType(conceptTypeVO));
     }