From a3d8b399c0991a53abf19cb37020a1861d0764ea Mon Sep 17 00:00:00 2001
From: yangkexiang <1677036288@qq.com>
Date: Thu, 7 May 2026 10:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B3=A8=E9=87=8A=E4=BB=8EOGNL?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=86=85=E9=83=A8=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
index f738db11..0e35f3a2 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
@@ -338,8 +338,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 只显示未生成医嘱的手术 -->
             AND sr.id IS NULL
             <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+                <!-- 补充 encounter_id 替换，修复多表关联时字段歧义。注释不能放进 OGNL 表达式内部。 -->
                 <![CDATA[
-                AND ${ew.sqlSegment.replace('tenant_id', 's.tenant_id').replace('create_time', 's.create_time').replace('surgery_no', 's.surgery_no').replace('surgery_name', 's.surgery_name').replace('patient_name', 's.patient_name').replace('main_surgeon_name', 's.main_surgeon_name').replace('anesthetist_name', 's.anesthetist_name').replace('org_name', 's.org_name').replace('status_enum', 's.status_enum').replace('planned_time', 's.planned_time').replace('encounter_id', 's.encounter_id')/* 补充encounter_id替换，修复多表关联时字段歧义 */}
+                AND ${ew.sqlSegment.replace('tenant_id', 's.tenant_id').replace('create_time', 's.create_time').replace('surgery_no', 's.surgery_no').replace('surgery_name', 's.surgery_name').replace('patient_name', 's.patient_name').replace('main_surgeon_name', 's.main_surgeon_name').replace('anesthetist_name', 's.anesthetist_name').replace('org_name', 's.org_name').replace('status_enum', 's.status_enum').replace('planned_time', 's.planned_time').replace('encounter_id', 's.encounter_id')}
                 ]]>
             </if>
         </where>