From 64bf0fb622915fa750e73b99c20e5676823c10b1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 29 Aug 2025 13:43:56 +0800
Subject: [PATCH] =?UTF-8?q?GA=20=20=E8=8E=B7=E5=8F=96=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E6=98=AF=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84=E8=AF=BE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs | 2 +-
 IRaCIS.Core.Application/Service/Visit/PatientService.cs       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
index 01b78cec2..fd7274169 100644
--- a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
@@ -48,7 +48,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Affiliation), t => t.Affiliation.Contains(inQuery.Affiliation))
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ContactPhone), t => t.ContactPhone.Contains(inQuery.ContactPhone))
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ContactName), t => t.ContactName.Contains(inQuery.ContactName))
-                  .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupIdList.Contains(t.Id))
+                  .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupIdList.Contains(t.Id) && t.IdentityUserList.Where(t => t.IsManager).Any(t => t.HospitalGroupId == t.Id))
                    .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE.Contains(inQuery.CallingAE))
                   .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
                    .ProjectTo<HospitalGroupView>(_mapper.ConfigurationProvider);
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 5be3b958e..b0dfd6277 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -2947,6 +2947,7 @@ namespace IRaCIS.Application.Services
         {
 
             var dirDic = new Dictionary<string, string>();
+
             #region DIR处理导出文件名，并将对应关系上传到OSS里面存储
 
             //有传输语法值的导出 才生成DIR