diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 86e60eb1d..dac5ed4c5 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -497,6 +497,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsClinicalDataSign { get; set; }
 
         public bool IsFrontTaskNeedSignButNotSign { get; set; }
+
+        public EvaluateProgress EvaluateProgressEnum { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index aba5e6436..b996c556d 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1325,7 +1325,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     TrialReadingCriterionId = u.TrialReadingCriterionId,
                     IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
                     IsClinicalDataSign = u.IsClinicalDataSign,
-                    IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
+                    IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign,
+                    EvaluateProgressEnum = u.EvaluateProgressEnum
                 })
                 .ToList(),
 
@@ -1355,7 +1356,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     TrialReadingCriterionId = u.TrialReadingCriterionId,
                     IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
                     IsClinicalDataSign = u.IsClinicalDataSign,
-                    IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
+                    IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign,
+                    EvaluateProgressEnum = u.EvaluateProgressEnum
                 })
                 .ToList(),
             }).Where(x => x.UnReadCanReadTaskCount > 0)/*.OrderBy(x => x.UnReadCanReadTaskCount)*/;
diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/HospitalGroupViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/HospitalGroupViewModel.cs
index e6bc1db10..1ef4fb034 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/HospitalGroupViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/HospitalGroupViewModel.cs
@@ -39,9 +39,11 @@ public class HospitalGroupAddOrEdit
 
     public string CallingAE { get; set; }
 
-    public List<Guid> IdentityUserIdList { get; set; }
+    public List<Guid> IdentityUserIdList { get; set; } = new List<Guid>();
 }
 
+
+
 public class HospitalGroupQuery : PageInput
 {
     public string? Affiliation { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
index 488a8afa5..01b78cec2 100644
--- a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
@@ -24,9 +24,10 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
     /// </summary>
     /// <returns></returns>
 
-    public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList()
+    public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList(Guid hospitalGroupId)
     {
-        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false)).ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
+        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false) && t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId))
+            .ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
         return list;
     }
@@ -96,26 +97,24 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
 
             var addEntity = _mapper.Map<HospitalGroup>(addOrEditHospitalGroup);
 
-            addEntity.IdentityUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, IsManager = true }).ToList();
-
             var newEntity = await _hospitalGroupRepository.AddAsync(addEntity, true, verifyExp1);
 
             return ResponseOutput.Ok(newEntity.Id.ToString());
         }
         else
         {
-            await _hospitalGroupIdentityUserRepository.BatchDeleteNoTrackingAsync(t => t.HospitalGroupId == addOrEditHospitalGroup.Id && t.IsManager);
 
-            //var find = await _hospitalGroupRepository.FirstOrDefaultAsync(t => t.Id == addOrEditHospitalGroup.Id);
+            var gaAdminList = _hospitalGroupRepository.Where(t => t.Id == addOrEditHospitalGroup.Id).SelectMany(t => t.IdentityUserList.Where(t => t.IsManager)).Select(t => t.IdentityUserId).ToList();
 
-            //_mapper.Map(addOrEditHospitalGroup, find);
 
-            var adminUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true }).ToList();
-
-            await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList);
             var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, true, false, verifyExp1);
 
 
+            await _hospitalGroupIdentityUserRepository.BatchUpdateNoTrackingAsync(t => gaAdminList.Contains(t.IdentityUserId) && t.HospitalGroupId == addOrEditHospitalGroup.Id, u => new HospitalGroupIdentityUser() { IsManager = false });
+
+            await _hospitalGroupIdentityUserRepository.BatchUpdateNoTrackingAsync(t => addOrEditHospitalGroup.IdentityUserIdList.Contains(t.IdentityUserId) && t.HospitalGroupId == addOrEditHospitalGroup.Id, u => new HospitalGroupIdentityUser() { IsManager = true });
+
+            await _hospitalGroupIdentityUserRepository.SaveChangesAsync();
         }
 
         return ResponseOutput.Ok();
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 4be3ce55c..5be3b958e 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -218,7 +218,7 @@ namespace IRaCIS.Application.Services
                  //GA 要过滤课题组
                  .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupIdList.Contains(t.HospitalGroupId))
                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OA && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.GA
-                  , t => t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId) && t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId))
+                  , t => t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId) && t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId) && _userInfo.HospitalGroupIdList.Contains(t.HospitalGroupId))
                 .ProjectTo<NewTrialView>(_mapper.ConfigurationProvider);
 
 
diff --git a/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs b/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs
index d57a908f1..57e7c7986 100644
--- a/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs
@@ -206,8 +206,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<HospitalGroup, HospitalGroupView>()
-                .ForMember(d => d.GAUserList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => t.IdentityUser)))
-                 .ForMember(d => d.IdentityUserIdList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => t.IdentityUser.Id)));
+                .ForMember(d => d.GAUserList, u => u.MapFrom(s => s.IdentityUserList.Where(t=>t.IsManager).Select(t => t.IdentityUser)))
+                 .ForMember(d => d.IdentityUserIdList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => t.IdentityUserId)));
 
 
             CreateMap<HospitalGroup, HospitalGroupAddOrEdit>().ReverseMap();