From 8da2e797bd817b761f7e8eaa564f35c00b9065fb Mon Sep 17 00:00:00 2001
From: gaozhaochen <gaozhaochen@wondersgroup.com>
Date: Tue, 5 Sep 2023 12:36:39 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=A7=91=E5=AE=A4=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stc/sict/theme/hpgp/dao/HpgpDepartmentRankMapper.java   | 2 +-
 .../sict/theme/hpgp/service/HpgpDepartmentRankService.java  | 2 +-
 .../hpgp/service/impl/HpgpDepartmentRankServiceImpl.java    | 6 ++++--
 .../main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpDepartmentRankMapper.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpDepartmentRankMapper.java
index 0ed9faa..2645db1 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpDepartmentRankMapper.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpDepartmentRankMapper.java
@@ -27,5 +27,5 @@ public interface HpgpDepartmentRankMapper extends BaseMapper<HpgpDepartmentRank>
                                                  @Param("deptName") String deptName,
                                                  @Param("size") int size);
 
-    List<Map<String,List<Map<String,String>>>> getStandardDeptDic(@Param("hospitalCode") String hospitalCode);
+    List<Map<String,Object>> getStandardDeptDic(@Param("hospitalCode") String hospitalCode);
 }
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java
index db4487c..f01e85b 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java
@@ -26,5 +26,5 @@ public interface HpgpDepartmentRankService extends IService<HpgpDepartmentRank>
      * @param hospitalCode 医院编码
      * @return
      */
-    List<Map<String, List<Map<String, String>>>> getStandardDeptDic(String hospitalCode);
+    List<Map<String,Object>> getStandardDeptDic(String hospitalCode);
 }
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java
index 2ecf154..bbf24ce 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import cn.sh.stc.sict.cloud.common.core.constant.Constant;
+import cn.sh.stc.sict.theme.hpgp.dao.HpAppointmentEvaMapper;
 import cn.sh.stc.sict.theme.hpgp.model.HpgpBusyIdlePrediction;
 import cn.sh.stc.sict.theme.hpgp.service.HpgpBusyIdlePredictionService;
 import cn.sh.stc.sict.theme.hphy.wd.*;
@@ -33,6 +34,7 @@ import java.util.Map;
 @Service("hpgpDepartmentRankService")
 public class HpgpDepartmentRankServiceImpl extends ServiceImpl<HpgpDepartmentRankMapper, HpgpDepartmentRank> implements HpgpDepartmentRankService {
 
+    private final HpgpDepartmentRankMapper hpgpDepartmentRankMapper;
 
     @Override
     public void updateResource() {
@@ -63,8 +65,8 @@ public class HpgpDepartmentRankServiceImpl extends ServiceImpl<HpgpDepartmentRan
     }
 
     @Override
-    public List<Map<String, List<Map<String, String>>>> getStandardDeptDic(String hospitalCode) {
-        return this.getStandardDeptDic(hospitalCode);
+    public List<Map<String,Object>> getStandardDeptDic(String hospitalCode) {
+        return hpgpDepartmentRankMapper.getStandardDeptDic(hospitalCode);
     }
 
     @Async
diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml
index 7977bbf..9881f61 100644
--- a/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml
+++ b/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml
@@ -14,7 +14,7 @@
 
     <resultMap id="StandardDeptDicMap" type="java.util.LinkedHashMap">
         <result property="standardDeptCategory" column="standard_dept_category"/>
-        <collection property="children" javaType="java.lang.String" ofType="java.util.LinkedHashMap">
+        <collection property="children" javaType="java.util.List" ofType="java.lang.String">
             <result property="standardDept" column="standard_dept"/>
         </collection>
     </resultMap>
@@ -52,7 +52,7 @@
         </if>
     </select>
 
-    <select id="getStandardDeptDic" resultType="java.util.LinkedHashMap">
+    <select id="getStandardDeptDic" resultMap="StandardDeptDicMap">
         SELECT distinct standard_dept_category,standard_dept
         FROM hpgp_department_rank
         <where>
-- 
2.22.0