From 38ef377cbd7e7c1b83e94cdf31d140139d050a83 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Wed, 7 Jan 2026 22:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86->=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/SysDictDataMapper.xml |  2 +-
 .../appservice/impl/SurgeryAppServiceImpl.java    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

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 @@
             <if test="listClass != null">list_class = #{listClass},</if>
             <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="pyStr !=null">pyStr = #{pyStr},</if>
+            <if test="pyStr !=null">py_str = #{pyStr},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             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<SurgeryDto> 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("手术信息不存在");
         }