From 32f7077fc1a7d96ab048bb9c7fe474e27b2b0027 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 17 Mar 2026 17:28:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(datadictionary):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=AB=E5=90=8D=E9=97=AE=E9=A2=98=20BUG#183?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正DiagTreatMAppServiceImpl中searchKey字段添加表别名T1前缀
- 移除ActivityDefinitionManageMapper.xml中不必要的字段名替换逻辑
- 确保查询条件正确使用表别名避免字段冲突
- 保持租户ID和状态枚举的别名替换功能正常工作
---
 .../appservice/impl/DiagTreatMAppServiceImpl.java             | 2 +-
 .../mapper/datadictionary/ActivityDefinitionManageMapper.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
index 709ceb88..569d95a8 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
@@ -202,7 +202,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
 
         // 构建查询条件
         QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
-                searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
+                searchKey, new HashSet<>(Arrays.asList("T1.bus_no", "T1.name", "T1.py_str", "T1.wb_str")), request);
 
         // 如果需要按医保类型过滤（如挂号费类型13），添加带表别名的条件
         if (ybTypeValue != null) {
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
index 6c2a3513..c19d1f42 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -55,10 +55,10 @@
             <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
                 <choose>
                     <when test="ew.customSqlSegment.contains('tenant_id')">
-                        ${ew.customSqlSegment.replaceFirst('tenant_id', 'T1.tenant_id').replaceFirst('status_enum', 'T1.status_enum').replaceFirst('name', 'T1.name').replaceFirst('WHERE', 'AND')}
+                        ${ew.customSqlSegment.replaceFirst('tenant_id', 'T1.tenant_id').replaceFirst('status_enum', 'T1.status_enum').replaceFirst('WHERE', 'AND')}
                     </when>
                     <otherwise>
-                        ${ew.customSqlSegment.replaceFirst('status_enum', 'T1.status_enum').replaceFirst('name', 'T1.name').replaceFirst('WHERE', 'AND')}
+                        ${ew.customSqlSegment.replaceFirst('status_enum', 'T1.status_enum').replaceFirst('WHERE', 'AND')}
                     </otherwise>
                 </choose>
             </if>