From 65a895a8e349abfbca44460b8333ae29c55e47f8 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentronhealth.com>
Date: Sun, 14 Jun 2026 20:22:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(#742):=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

---
 .../InHospitalRegisterAppMapper.xml           | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
index e6cbc4b5f..6a0a5f061 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
@@ -22,7 +22,6 @@
         ihri.status_enum,
         ihri.id_card,
         ihri.organization_name
-        from (SELECT ae.tenant_id,
         ae.ID AS encounter_id,
         ae.amb_encounter_id AS amb_encounter_id,
         ae.patient_id AS patient_id,
@@ -42,12 +41,6 @@
         FROM adm_encounter AS ae
         LEFT JOIN adm_organization AS ao_zy ON ao_zy.ID = ae.organization_id
         AND ao_zy.delete_flag = '0'
-        LEFT JOIN adm_encounter AS ambae ON ae.amb_encounter_id = ambae.
-        ID
-        LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id
-        AND ao.delete_flag = '0'
-        LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
-        AND ap.delete_flag = '0'
         LEFT JOIN adm_encounter_location AS ael ON ael.encounter_id = ae.ID
         AND ael.delete_flag = '0'
         AND ael.form_enum = #{formEnum}
@@ -60,21 +53,11 @@
         AND aa.type_code = '04'
         WHERE ae.delete_flag = '0'
         AND ae.class_enum = #{encounterClass}
-        <if test='startTime != null'>
             AND ae.create_time &gt;= #{startTime}
-        </if>
-        <if test='endTime != null'>
             AND ae.create_time &lt;= #{endTime}
-        </if>
-        <if test='organizationId != null'>
             AND ae.organization_id = #{organizationId}
-        </if>
-        <if test="registeredFlag == '0'.toString()">
             AND ae.status_enum = #{encounterStatus}
-        </if>
-        <if test="registeredFlag == '1'.toString()">
             AND ae.status_enum != #{encounterStatus}
-        </if>
         ) AS ihri
         ${ew.customSqlSegment}
         ORDER BY ihri.request_time DESC
@@ -202,4 +185,34 @@
         </if>
         AND tenant_id = 1  <!-- 多租户ID（若为动态，可改为参数传入） -->
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
+        ID LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id
+        <if test="startTime != null">
+        <if test="endTime != null">
+        <if test="organizationId != null">
+        <if test='registeredFlag == "0"'>
+        <if test='registeredFlag == "1"'>
+        LEFT JOIN adm_encounter AS ambae ON ae.amb_encounter_id = ambae.ID
+        LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id
+        AND ao.delete_flag = '0'
+        </if>
+        </if>
+        </if>
+        </if>
+        </if>
+        FROM (SELECT ae.tenant_id,
+        LEFT JOIN adm_encounter AS ambae ON ae.amb_encounter_id = ambae.ID
+        LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id
+        AND ao.delete_flag = '0'
+        LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+        AND ap.delete_flag = '0'
+        <if test="startTime != null">
+        </if>
+        <if test="endTime != null">
+        </if>
+        <if test="organizationId != null">
+        </if>
+        <if test='registeredFlag == "0"'>
+        </if>
+        <if test='registeredFlag == "1"'>
+        </if>
\ No newline at end of file