From 65a52e9742772e787819a76866343795e6ee05d1 Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 11 Jun 2026 10:06:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(common):=20=E4=BF=AE=E5=A4=8D=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=BC=93=E5=AD=98=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复 DictUtils 中的字典缓存获取逻辑，添加类型检查避免 ClassCastException - 优化住院登记查询接口，增加时间范围和机构ID参数支持 - 修改审核趋势接口，将开始日期参数设为可选 - 更新申请单分页查询接口，使用 ModelAttribute 替代 RequestBody - 修复住院注册查询方法的参数传递问题 --- .../src/main/java/com/core/common/utils/DictUtils.java | 5 ++++- .../appservice/impl/InHospitalRegisterAppServiceImpl.java | 2 +- .../inhospitalcharge/mapper/InHospitalRegisterAppMapper.java | 1 + .../web/rationaldrug/controller/RationalDrugController.java | 2 +- .../controller/RequestFormManageController.java | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java b/healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java index 9718f6da6..cf55afd68 100755 --- a/healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java +++ b/healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java @@ -38,8 +38,11 @@ public class DictUtils { * @return dictDatas 字典数据列表 */ public static List getDictCache(String key) { - JsonNode arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); + Object arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); if (StringUtils.isNotNull(arrayCache)) { + if (arrayCache instanceof List) { + return (List) arrayCache; + } return new ObjectMapper().convertValue(arrayCache, new com.fasterxml.jackson.core.type.TypeReference>() {}); } return null; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index 7384f8a23..3312e894d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -182,7 +182,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS IPage inHospitalRegisterInfo = inHospitalRegisterAppMapper .getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus, - registeredFlag, LocationForm.WARD.getValue(), queryWrapper); + registeredFlag, LocationForm.WARD.getValue(), null, null, null, queryWrapper); inHospitalRegisterInfo.getRecords().forEach(e -> { // 性别 e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java index 387e1d9cc..b73f87fbf 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java @@ -33,6 +33,7 @@ public interface InHospitalRegisterAppMapper { IPage getInHospitalRegisterInfo(@Param("page") Page page, @Param("encounterClass") Integer encounterClass, @Param("encounterStatus") Integer encounterStatus, @Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum, + @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("organizationId") Long organizationId, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); /** diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java index f72b36b5e..74d5e008c 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java @@ -61,7 +61,7 @@ public class RationalDrugController { @GetMapping("/trend") @Operation(summary = "审核趋势") - public AjaxResult getAuditTrend(@RequestParam String startDate) { + public AjaxResult getAuditTrend(@RequestParam(required = false) String startDate) { List> trend = rationalDrugAppService.getAuditTrend(startDate); return AjaxResult.success(trend); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java index acf7ddd21..93fad9e7c 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java @@ -192,7 +192,7 @@ public class RequestFormManageController { * @return 申请单 */ @RequestMapping(value = "/page") - public R> getRequestFormPage(@RequestBody RequestFormDto requestFormDto) { + public R> getRequestFormPage(@ModelAttribute RequestFormDto requestFormDto) { return R.ok(iRequestFormManageAppService.getRequestFormPage(requestFormDto)); }