From c75b8038ec082ff1524bdb493adf42b196f5a967 Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Tue, 19 May 2026 14:02:23 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#547:=20=E6=A0=B9=E5=9B=A0+?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B9=E6=A1=88=E6=91=98=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IOrganizationLocationService.java        |  8 ++++++++
 .../impl/OrganizationLocationServiceImpl.java        | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
index 7cbe989c..9c82a9fd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
@@ -38,4 +38,12 @@ public interface IOrganizationLocationService extends IService<OrganizationLocat
      */
     List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId);
 
+    /**
+     * 根据诊疗定义id查询所有执行科室列表（跨科室）
+     *
+     * @param activityDefinitionId 诊疗定义id
+     * @return 执行科室列表
+     */
+    List<OrganizationLocation> getOrgLocListByActivityDefinitionId(Long activityDefinitionId);
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
index 0212232e..225c518a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
@@ -64,4 +64,16 @@ public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLoc
             .eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
     }
 
+    /**
+     * 根据诊疗定义id查询所有执行科室列表（跨科室）
+     *
+     * @param activityDefinitionId 诊疗定义id
+     * @return 执行科室列表
+     */
+    @Override
+    public List<OrganizationLocation> getOrgLocListByActivityDefinitionId(Long activityDefinitionId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
+            .eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
+    }
+
 }
\ No newline at end of file