字典

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

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

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

@@ -244,8 +244,8 @@ 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);
+        List<DictionaryInfoDTO> dicTypeName_back = klDictionaryInfoFacade.getListByGroupType(13);
+        List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
 
         //检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
         if (ListUtil.isEmpty(types)

src/main/resources/mapper/KlConceptMapper.xml

@@ -441,7 +441,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -474,7 +476,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -507,7 +511,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -543,7 +549,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -576,7 +584,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -609,7 +619,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,

src/main/resources/mapper/KlConceptStaticMapper.xml

@@ -226,7 +226,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -260,7 +262,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -294,7 +298,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -330,7 +336,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -364,7 +372,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -398,7 +408,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,