字典

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

@@ -365,9 +365,9 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
 
         List<Integer> types = staticKnowledgeIndexPageVO.getTypes();
 
-        List<DictionaryInfoDTO> dicType = dictionaryFacade.getListByGroupType(10);
+        List<DictionaryInfoDTO> dicType = dictionaryFacade.getListByGroupType(7);
         Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
-        List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
+        List<DictionaryInfoDTO> dicTypeName = klDictionaryInfoFacade.getListByGroupType(13);
 
         //检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、4-检查、5-手术和操作
         if (ListUtil.isEmpty(types)

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

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