From 43f3d1ba94727f3f0a9e48bb48994d2e27971917 Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Fri, 7 Nov 2025 13:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8C=BB=E5=98=B1=E7=9A=84=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=A7=91=E5=AE=A4=E9=BB=98=E8=AE=A4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=AF=8A=E7=96=97=E9=A1=B9=E7=9B=AE=E7=BB=B4=E6=8A=A4=E7=9A=84?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=A7=91=E5=AE=A4=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E8=AF=8A=E7=96=97=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=A7=91=E5=AE=A4=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=A7=91=E5=AE=A4=E4=B8=BA=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=EF=BC=8C=E7=84=B6=E5=90=8E=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=8F=88=E6=9D=83=E9=99=90=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 d7e77cc2..1daa048c 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
@@ -201,7 +201,7 @@
             '' AS manufacturer,
             T2.ID AS charge_item_definition_id,
             T2.instance_table AS advice_table_name,
-            T3.organization_id AS position_id,
+            COALESCE(T3.organization_id, T1.org_id) AS position_id,
             0 AS restricted_flag,
             '' AS restricted_scope
             FROM wor_activity_definition AS T1