From 095c43bbf37ad367aa661eb07668defaa40318d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E7=8B=BB=E7=8C=8A?= <sarem_w@sina.com>
Date: Mon, 19 Jan 2026 21:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BB=E5=98=B1=E4=B8=8B?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AF=BB=E5=8F=96=E6=85=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E8=A7=A3=E5=86=B3=E7=B3=BB=E5=88=97?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E8=AF=BB=E5=8F=96=E6=85=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/openhis/common/aspectj/DictAspect.java   | 16 +++++-----------
 .../doctorstation/components/adviceBaseList.vue  |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
index 82d75965..c35d38a6 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
@@ -2,6 +2,7 @@ package com.openhis.common.aspectj;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.utils.DictUtils;
 import com.openhis.common.annotation.Dict;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -115,19 +116,12 @@ public class DictAspect {
     }
 
     private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) {
-        String sql;
-        if (StringUtils.isEmpty(dictTable)) {
-            // 场景 1：默认查询 sys_dict_data 表
-            sql = "SELECT dict_label FROM sys_dict_data WHERE dict_type = ? AND dict_value::varchar = ? LIMIT 1";
-            try {
-                return jdbcTemplate.queryForObject(sql, String.class, dictCode, dictValue);
-            } catch (DataAccessException e) {
-                // 如果查询结果为空，返回 空字符串
-                return "";
-            }
+        if (StringUtils.hasText(dictTable)) {
+            // 场景 1：默认字典走DictUtils缓存
+            return DictUtils.getDictLabel(dictCode, dictValue);
         } else {
             // 场景 2：查询指定表
-            sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
+            String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
             try {
                 return jdbcTemplate.queryForObject(sql, String.class, dictValue);
             } catch (DataAccessException e) {
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index 12c6a6f4..bdc16ab7 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -424,7 +424,7 @@ function clickRow(row) {
 
 // 初始化
 onMounted(() => {
-  preloadData(); // 预加载数据
+  // preloadData(); // 预加载数据
   getList(); // 获取初始数据
 });