From 290e8f8f15dbb9229ed447e7cca1798c40bfa920 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentron.com>
Date: Sat, 25 Apr 2026 20:10:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#445=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E6=89=8B=E6=9C=AF=E5=BE=85=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E5=89=94=E9=99=A4=E5=B7=B2=E7=94=9F=E6=88=90=E5=8C=BB?=
 =?UTF-8?q?=E5=98=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因: getSurgeryPage查询只查cli_surgery表，没有关联wor_service_request表检查是否已生成医嘱。
所有手术都会显示在待生成列表中，不管是否已处理。

修复: 在getSurgeryPage查询中LEFT JOIN wor_service_request表，
通过sr.id IS NULL过滤掉已生成医嘱的手术。
---
 .../main/resources/mapper/clinicalmanage/SurgeryMapper.xml    | 4 ++++
 1 file changed, 4 insertions(+)

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 5239fbd4..17c94402 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
@@ -331,8 +331,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) t
             WHERE rn = 1
         ) pi ON s.patient_id = pi.patient_id
+        <!-- 排除已生成医嘱的手术 -->
+        LEFT JOIN wor_service_request sr ON sr.activity_id = s.id AND sr.delete_flag = '0' AND sr.category_enum = 4
         <where>
             s.delete_flag = '0'
+            <!-- 只显示未生成医嘱的手术 -->
+            AND sr.id IS NULL
             <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
                 <![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')}