From 059ef483ca24745c8f5f014d2ca0c93bab187aec Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentron.com>
Date: Sat, 25 Apr 2026 16:12:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#447=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=99=E6=89=8B=E6=9C=AF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E6=89=8B?=
 =?UTF-8?q?=E6=9C=AF=E7=B1=BB=E8=AF=8A=E7=96=97=E7=9B=AE=E5=BD=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因: adviceType=3(诊疗)查询时强制排除手术项(category_code!='手术'且!='24'),
导致通过categoryCode='24'显式查询手术项目时结果为空。

修复: 仅在未指定categoryCode时才排除手术,
当显式指定categoryCode='24'或'手术'时允许加载手术类项目。
---
 .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index a0c3ebf7..f320bc64 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -277,7 +277,7 @@
                     AND (T1.category_code = '手术' OR T1.category_code = '24')
                 </if>
                 <!-- 如果只选择诊疗(adviceType=3)，排除手术 -->
-                <if test="adviceTypes.contains(3) and !adviceTypes.contains(6)">
+                <if test="adviceTypes.contains(3) and !adviceTypes.contains(6) and (categoryCode == null or categoryCode == '')">
                     AND T1.category_code != '手术' AND T1.category_code != '24'
                 </if>
                 <if test="searchKey != null and searchKey != ''">