|
|
@@ -245,6 +245,7 @@ public class MedRetrievalFacade {
|
|
|
List<DictionaryInfoDTO> dicType = dictionaryFacade.getListByGroupType(10);
|
|
|
Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
|
|
|
List<DictionaryInfoDTO> dicTypeName = klDictionaryInfoFacade.getListByGroupType(13);
|
|
|
+ List<DictionaryInfoDTO> dicTypeName_back = dictionaryFacade.getListByGroupType(13);
|
|
|
|
|
|
//检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
|
|
|
if (ListUtil.isEmpty(types)
|
|
|
@@ -291,7 +292,11 @@ public class MedRetrievalFacade {
|
|
|
List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);
|
|
|
|
|
|
retList.forEach(i -> {
|
|
|
- i.setTypeName(convertTypeName(i.getTypeName(), 2, dicTypeName));
|
|
|
+ if (staticKnowledgeIndexVO.getHasInfo().equals(1)) {
|
|
|
+ i.setTypeName(convertTypeName(i.getTypeName(), 2, dicTypeName));
|
|
|
+ } else {
|
|
|
+ i.setTypeName(convertTypeName(i.getTypeName(), 2, dicTypeName_back));
|
|
|
+ }
|
|
|
if (dicTypeMap.containsKey(i.getTypeName())) {
|
|
|
i.setType(Integer.valueOf(dicTypeMap.get(i.getTypeName())));
|
|
|
}
|
zhaops