From b063a2fb20e94bc9204141878d8a2d44fe0e6c50 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentronhealth.com>
Date: Sun, 14 Jun 2026 05:10:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(#735):=20guanyu=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/patientmanage/PatientManageMapper.xml    | 13 +++++++++----
 .../regdoctorstation/AdviceManageAppMapper.xml      |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
index 5fe51ee3a..3671a50e7 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
@@ -2,10 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.healthlink.his.web.patientmanage.mapper.PatientManageMapper">
     <!-- 病人信息相关查询-->
-    <!-- Bug#717: 移除无用关联子查询 identifier_no（DTO无对应字段），
-         避免 TenantLineInnerInterceptor 用 JSqlParser 解析 SQL 时因裸列名导致 country_code ambiguous -->
     <select id="getPatientPage" resultType="com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto">
         SELECT
+               (
+                   SELECT api.identifier_no
+                   FROM adm_patient_identifier api
+                   WHERE api.tenant_id = p.tenant_id
+                     AND api.patient_id = p.id
+                   LIMIT 1
+               ) AS identifier_no,
                p.tenant_id,
                p.id,
                p.active_flag,
@@ -54,7 +59,7 @@
         FROM adm_patient p
         <where>
             p.delete_flag = '0'
-            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+            <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
                 AND ${ew.sqlSegment}
             </if>
         </where>
@@ -99,7 +104,7 @@
         LEFT JOIN adm_patient AS pt ON enc.patient_id = pt.ID AND pt.delete_flag = '0'
         <where>
             enc.delete_flag = '0'
-            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+            <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
                 AND ${ew.sqlSegment}
             </if>
         </where>
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
index 0476e14e6..f122d7c68 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -306,7 +306,7 @@
         null AS skin_test_flag,
         null AS inject_flag,
         null AS group_id,
-        COALESCE(T1.content_json::jsonb->>'adviceName', T2.NAME, T1.content_json::jsonb->>'surgeryName') AS advice_name,
+        COALESCE(T2.NAME, T1.content_json::jsonb->>'surgeryName', T1.content_json::jsonb->>'adviceName') AS advice_name,
         '' AS volume,
         '' AS lot_number,
         T1.quantity AS quantity,