From 4beb4c40c57d713368d826465c9be473f1a4ff5a Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentron.com>
Date: Sat, 25 Apr 2026 15:27:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#448=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E5=88=92=E4=BB=B7=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=A4=B1=E6=95=88=20-=20=E8=80=97=E6=9D=90=E5=92=8C?=
 =?UTF-8?q?=E8=AF=8A=E7=96=97=E6=9F=A5=E8=AF=A2=E7=BC=BA=E5=B0=91categoryC?=
 =?UTF-8?q?ode=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- adviceType=2(耗材)查询添加categoryCode过滤
- adviceType=3(诊疗)查询添加categoryCode过滤
- 与adviceType=1(药品)保持一致的过滤逻辑
- 修复选择耗材类型时仍检索出药品的问题
---
 .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

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 aa87ce69..a0c3ebf7 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
@@ -186,6 +186,9 @@
                 <if test="searchKey != null and searchKey != ''">
                     AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
                 </if>
+                <if test="categoryCode != null and categoryCode != ''">
+                    AND t1.category_code = #{categoryCode}
+                </if>
                 <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
                     AND t1.id IN
                     <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
@@ -280,6 +283,9 @@
                 <if test="searchKey != null and searchKey != ''">
                     AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
                 </if>
+                <if test="categoryCode != null and categoryCode != ''">
+                    AND t1.category_code = #{categoryCode}
+                </if>
                 <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
                     AND t1.id IN
                     <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">