diff --git a/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 1c7b413d..76fda760 100644
--- a/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/openhis-server-new/core-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -120,7 +120,7 @@
list_class = #{listClass},
is_default = #{isDefault},
status = #{status},
- pyStr = #{pyStr},
+ py_str = #{pyStr},
remark = #{remark},
update_by = #{updateBy},
update_time = now()
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
index 2d462e49..b9fafab4 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
@@ -128,16 +128,21 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
@Override
public R getSurgeryDetail(Long id) {
String cacheKey = RedisKeys.getSurgeryKey(id);
- SurgeryDto surgeryDto = redisCache.getCacheObject(cacheKey);
+ Object cachedObject = redisCache.getCacheObject(cacheKey);
// 先从Redis缓存中获取
- if (surgeryDto != null) {
- log.info("从Redis缓存中获取手术信息 - surgeryId: {}", id);
- return R.ok(surgeryDto);
+ if (cachedObject != null) {
+ if (cachedObject instanceof SurgeryDto) {
+ SurgeryDto surgeryDto = (SurgeryDto) cachedObject;
+ log.info("从Redis缓存中获取手术信息 - surgeryId: {}", id);
+ return R.ok(surgeryDto);
+ } else {
+ log.warn("Redis缓存中手术信息类型不匹配 - surgeryId: {}", id);
+ }
}
// 缓存中没有,从数据库查询
- surgeryDto = surgeryAppMapper.getSurgeryDetail(id);
+ SurgeryDto surgeryDto = surgeryAppMapper.getSurgeryDetail(id);
if (surgeryDto == null) {
return R.fail("手术信息不存在");
}