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 0ed9faa7280989bea56dad1e0aeb113c050b97cd..2645db1c39b05386fef6f6536ad948c10547ab18 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 @Param("deptName") String deptName, @Param("size") int size); - List>>> getStandardDeptDic(@Param("hospitalCode") String hospitalCode); + List> 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 db4487ce6fe58994ea842415b46fedfc5b6a596c..f01e85b0536ed60024a3186ca59c253865c23065 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 * @param hospitalCode 医院编码 * @return */ - List>>> getStandardDeptDic(String hospitalCode); + List> 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 2ecf154917fa06fbd0f3af514ac7069f5cc80477..bbf24ceafb203e904d997f6e7228495a416fde31 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 implements HpgpDepartmentRankService { + private final HpgpDepartmentRankMapper hpgpDepartmentRankMapper; @Override public void updateResource() { @@ -63,8 +65,8 @@ public class HpgpDepartmentRankServiceImpl extends ServiceImpl>>> getStandardDeptDic(String hospitalCode) { - return this.getStandardDeptDic(hospitalCode); + public List> 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 7977bbf3a2fbdb327672e2b91235f33e67543bc6..9881f6185a1a97bab40a0d9380dd8e30dcdecc6d 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 @@ - + @@ -52,7 +52,7 @@ - SELECT distinct standard_dept_category,standard_dept FROM hpgp_department_rank