From d50e185e7da8038ac01769ad95a047a35f050941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Mon, 11 May 2026 11:22:37 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#509:=20[=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=99-=E6=89=8B=E6=9C=AF=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7]=20=E6=8F=90=E4=BA=A4=E7=94=B3=E8=AF=B7=E5=90=8E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=AA=E5=AE=9E=E6=97=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=94=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=9C=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复列表不显示问题：SurgeryMapper.xml 中 sr.id IS NULL 条件导致已生成医嘱的手术被过滤，
   提交手术时 addSurgery() 会创建 category_enum=4 的 ServiceRequest，导致查询立即被排除。
   移除 sr.id IS NULL 过滤条件，使手术申请列表正常展示所有手术记录。

2. 修复提示语问题：将后端 addSurgery 返回消息从"手术信息添加成功"改为"手术申请提交成功！"，
   updateSurgery 改为"手术申请修改成功！"，前端直接使用后端返回消息。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java | 4 ++--
 .../main/resources/mapper/clinicalmanage/SurgeryMapper.xml    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
index 971ab367..3e67b3a0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
@@ -418,7 +418,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         // 清除相关缓存
         clearSurgeryAppCache(surgery);
 
-        return R.ok(surgeryId, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[]{"手术信息"}));
+        return R.ok(surgeryId, "手术申请提交成功！");
     }
 
     /**
@@ -497,7 +497,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         // 清除相关缓存
         clearSurgeryAppCache(surgery);
 
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"手术信息"}));
+        return R.ok(null, "手术申请修改成功！");
     }
 
     /**
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 0e35f3a2..342fa421 100755
--- 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,12 +331,10 @@ 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 != ''">
                 <!-- 补充 encounter_id 替换，修复多表关联时字段歧义。注释不能放进 OGNL 表达式内部。 -->
                 <![CDATA[