Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8

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);

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