From 3eb506da2b7394ab0b24b7549952670fa340892a Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentronhealth.com>
Date: Sun, 14 Jun 2026 20:31:39 +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           | 137 +++++++-----------
 1 file changed, 54 insertions(+), 83 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 6a0a5f061..ad707cc1b 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
@@ -5,59 +5,60 @@
 <mapper namespace="com.healthlink.his.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper">
 
     <select id="getInHospitalRegisterInfo" resultType="com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto">
-        SELECT ihri.tenant_id,
-        ihri.encounter_id,
-        ihri.amb_encounter_id,
-        ihri.patient_id,
-        ihri.request_time,
-        ihri.registrar,
-        ihri.source_name,
-        ihri.patient_name,
-        ihri.gender_enum,
-        ihri.birth_date,
-        ihri.ward_name,
-        ihri.contract_no,
-        ihri.bus_no,
-        ihri.admit_source_code,
-        ihri.status_enum,
-        ihri.id_card,
-        ihri.organization_name
-        ae.ID AS encounter_id,
-        ae.amb_encounter_id AS amb_encounter_id,
-        ae.patient_id AS patient_id,
-        ae.create_time AS request_time,
-        aper.NAME AS registrar,
-        ao.NAME AS source_name,
-        ap.NAME AS patient_name,
-        ap.gender_enum AS gender_enum,
-        ap.birth_date AS birth_date,
-        al.NAME AS ward_name,
-        aa.contract_no,
-        ae.bus_no,
-        ae.admit_source_code,
-        ae.status_enum,
-        ap.id_card AS id_card,
-        ao_zy.NAME AS organization_name
-        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_location AS ael ON ael.encounter_id = ae.ID
-        AND ael.delete_flag = '0'
-        AND ael.form_enum = #{formEnum}
-        LEFT JOIN adm_location AS al ON al.ID = ael.location_id
-        AND al.delete_flag = '0'
-        LEFT JOIN adm_practitioner AS aper ON aper.ID = ae.registrar_id
-        AND aper.delete_flag = '0'
-        LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.ID
-        AND aa.delete_flag = '0'
-        AND aa.type_code = '04'
-        WHERE ae.delete_flag = '0'
-        AND ae.class_enum = #{encounterClass}
-            AND ae.create_time &gt;= #{startTime}
-            AND ae.create_time &lt;= #{endTime}
-            AND ae.organization_id = #{organizationId}
-            AND ae.status_enum = #{encounterStatus}
-            AND ae.status_enum != #{encounterStatus}
+        SELECT ihri.*
+        FROM (
+            SELECT ae.tenant_id,
+                   ae.ID AS encounter_id,
+                   ae.amb_encounter_id,
+                   ae.patient_id,
+                   ae.create_time AS request_time,
+                   aper.NAME AS registrar,
+                   ao.NAME AS source_name,
+                   ap.NAME AS patient_name,
+                   ap.gender_enum,
+                   ap.birth_date,
+                   al.NAME AS ward_name,
+                   aa.contract_no,
+                   ae.bus_no,
+                   ae.admit_source_code,
+                   ae.status_enum,
+                   ap.id_card,
+                   ao_zy.NAME AS organization_name
+            FROM adm_encounter AS ae
+            LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+                AND ap.delete_flag = '0'
+            LEFT JOIN adm_organization AS ao_zy ON ao_zy.ID = ae.organization_id
+                AND ao_zy.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}
+            LEFT JOIN adm_location AS al ON al.ID = ael.location_id
+                AND al.delete_flag = '0'
+            LEFT JOIN adm_practitioner AS aper ON aper.ID = ae.registrar_id
+                AND aper.delete_flag = '0'
+            LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.ID
+                AND aa.delete_flag = '0'
+                AND aa.type_code = '04'
+            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'
+            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"'>
+                AND ae.status_enum = #{encounterStatus}
+            </if>
+            <if test='registeredFlag == "1"'>
+                AND ae.status_enum != #{encounterStatus}
+            </if>
         ) AS ihri
         ${ew.customSqlSegment}
         ORDER BY ihri.request_time DESC
@@ -186,33 +187,3 @@
         AND tenant_id = 1  <!-- 多租户ID（若为动态，可改为参数传入） -->
     </select>
 </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