|
|
@@ -89,6 +89,8 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
List<DictionaryInfoDTO> dicStaticIndexList = dictionaryFacade.getListByGroupType(7);
|
|
|
//页面术语类型和图谱映射
|
|
|
List<DictionaryInfoDTO> dicTypeMappingList = dictionaryFacade.getListByGroupType(8);
|
|
|
+ //静态知识类型
|
|
|
+ List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
|
|
|
|
|
|
List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = Lists.newLinkedList();
|
|
|
RespDTO<List<StaticKnowledgeIndexDTO>> respDTO = cdssCoreClient.staticKnowledgeIndex(staticKnowledgeIndexVO);
|
|
|
@@ -166,13 +168,24 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
//排序
|
|
|
Map<String, List<StaticKnowledgeIndexDTO>> map
|
|
|
= EntityUtil.makeEntityListMap(staticKnowledgeIndexDTOList, "typeName");
|
|
|
+ Map<Integer, String> staticTypeDicMap =
|
|
|
+ EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
|
|
|
for (DictionaryInfoDTO dic : dicStaticIndexList) {
|
|
|
if (dic.getName().equals("检验")) {
|
|
|
- if (map.containsKey("检验套餐")) {
|
|
|
- retList.addAll(map.get("检验套餐"));
|
|
|
+ //3-检验套餐、4-检验细项
|
|
|
+ if (map.containsKey(staticTypeDicMap.get("3"))) {
|
|
|
+ retList.addAll(map.get(staticTypeDicMap.get("3")));
|
|
|
+ }
|
|
|
+ if (map.containsKey(staticTypeDicMap.get("4"))) {
|
|
|
+ retList.addAll(map.get(staticTypeDicMap.get("4")));
|
|
|
+ }
|
|
|
+ } else if (dic.getName().equals("检查")) {
|
|
|
+ //5-检查、6-检查子项
|
|
|
+ if (map.containsKey(staticTypeDicMap.get("5"))) {
|
|
|
+ retList.addAll(map.get(staticTypeDicMap.get("5")));
|
|
|
}
|
|
|
- if (map.containsKey("检验明细")) {
|
|
|
- retList.addAll(map.get("检验明细"));
|
|
|
+ if (map.containsKey(staticTypeDicMap.get("6"))) {
|
|
|
+ retList.addAll(map.get(staticTypeDicMap.get("6")));
|
|
|
}
|
|
|
} else if (map.containsKey(dic.getName())) {
|
|
|
retList.addAll(map.get(dic.getName()));
|
zhaops