From a6337ae397514b33d61d7e5e6d17b5f8758be985 Mon Sep 17 00:00:00 2001
From: yangkexiang <1677036288@qq.com>
Date: Fri, 15 May 2026 15:44:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug249:=E6=89=8B=E6=9C=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF?=
 =?UTF-8?q?=E5=AE=89=E6=8E=92=EF=BC=9A=E3=80=90=E6=96=B0=E5=A2=9E=E6=89=8B?=
 =?UTF-8?q?=E6=9C=AF=E5=AE=89=E6=8E=92=E3=80=91-=E3=80=8B=E3=80=90?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E3=80=91=E5=9C=A8=E9=97=A8=E8=AF=8A=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=AB=99=E5=B7=B2=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91?=
 =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E7=9A=84=E6=89=8B=E6=9C=AF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8D=95=E5=9C=A8=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E8=BF=98?=
 =?UTF-8?q?=E8=83=BD=E6=9F=A5=E8=AF=A2=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regdoctorstation/RequestFormManageAppMapper.xml   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
index fafd10ae4..ec834bd46 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -75,7 +75,8 @@
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
-        SELECT wsr.quantity,
+        SELECT wsr.activity_id AS activity_id,
+               wsr.quantity,
                wsr.unit_code,
                COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
                aci.total_price
@@ -147,9 +148,9 @@
                 fc.contract_name AS fee_type,
                 COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
             FROM doc_request_form drf
-            LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
-            LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
-            LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
+            INNER JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
+            INNER JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
+            INNER JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
             LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
             LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
             LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
@@ -184,6 +185,8 @@
                 </if>
                 AND drf.delete_flag = '0'
                 AND os.schedule_id IS NULL
+                <!-- 已取消(4)、已完成(3)的手术申请不参与门诊手术安排查找 -->
+                AND cs.status_enum NOT IN (3, 4)
             </where>
             ORDER BY drf.create_time DESC
     </select>