From 77b054a86cec38fb25f400941c40f67632280054 Mon Sep 17 00:00:00 2001
From: Ranyunqiao <2499115710@qq.com>
Date: Wed, 25 Mar 2026 14:35:54 +0800
Subject: [PATCH] =?UTF-8?q?215=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E3=80=8B=E9=97=A8=E8=AF=8A=E5=88=92=E4=BB=B7=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A3=80=E7=B4=A2=E4=B8=8D=E5=87=BA=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doctorstation/DoctorStationAdviceAppMapper.xml   | 12 ++++++++----
 .../bargain/component/adviceBaseList.vue             |  6 ------
 2 files changed, 8 insertions(+), 10 deletions(-)

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 939c8c80..cb1efea0 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
@@ -98,7 +98,7 @@
                 LEFT JOIN adm_organization_location AS T6 ON T6.distribution_category_code = t1.category_code AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
                 WHERE t1.delete_flag = '0'
                 AND T2.status_enum = #{statusEnum}
-                <if test="pricingFlag ==1">
+                <if test="pricingFlag == 1">
                     AND 1 = 2
                 </if>
                 <if test="searchKey != null and searchKey != ''">
@@ -110,7 +110,9 @@
                         #{itemId}
                     </foreach>
                 </if>
-                AND T5.instance_table = #{medicationTableName}
+                <if test="medicationTableName != null">
+                    AND (T5.instance_table = #{medicationTableName} OR T5.instance_table IS NULL)
+                </if>
                 )
                 <if test="adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
             </if>
@@ -119,7 +121,7 @@
                 (SELECT
                 DISTINCT ON (T1.ID)
                 T1.tenant_id,
-                4 AS advice_type,
+                2 AS advice_type,
                 T1.bus_no AS bus_no,
                 T1.category_code AS category_code,
                 '' AS pharmacology_category_code,
@@ -172,7 +174,9 @@
                         #{itemId}
                     </foreach>
                 </if>
-                AND T4.instance_table = #{deviceTableName}
+                <if test="deviceTableName != null">
+                    AND (T4.instance_table = #{deviceTableName} OR T4.instance_table IS NULL)
+                </if>
                 AND T1.status_enum = #{statusEnum}
                 )
                 <if test="adviceTypes.contains(3)">UNION ALL</if>
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
index fe8a9b48..efc91a6d 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
@@ -112,12 +112,6 @@ function getList() {
     return;
   }
   
-  // 必须有 adviceType 才查询，避免查询所有类型的数据
-  if (!queryParams.value.adviceType) {
-    console.log('[adviceBaseList] getList() 跳过：adviceType 未设置，当前值:', queryParams.value.adviceType);
-    return;
-  }
-  
   queryParams.value.organizationId = props.patientInfo.orgId;
   console.log('[adviceBaseList] getList() 请求参数:', JSON.stringify(queryParams.value));