diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index b1588a0ee..e1ed42cee 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1061,6 +1061,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var visitQuery = _visitTaskRepository
                 .Where(x => x.TrialId == inDto.TrialId && x.TaskState == TaskState.Effect)
+                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR && piReadingScopenEnum == PIReadingScopenEnum.AllBaseline,
+                t=>t.Subject.SubjectVisitTaskList.Any(c=>c.SourceSubjectVisit.IsBaseLine==true && c.ReadingTaskState==ReadingTaskState.HaveSigned))
+                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.PI && piReadingScopenEnum == PIReadingScopenEnum.AllVisit,
+                t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned))
 
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR, t => t.Subject.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
                 // 仅仅SR阅片 PI 没有任务列表
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 5b2126d95..0030802b5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -2510,14 +2510,13 @@ namespace IRaCIS.Application.Services
 
                     // 创建一个任务
                     IJobDetail job = JobBuilder.Create<CancelTaskQuartZJob>()
-                        .WithIdentity($"CancelTaskQuartZJob_{_userInfo.Id}", "group")
+                        
                         .UsingJobData("SubjectId", claimSubjectDto.SubejctId)  // 传递GUID参数给任务
                         .UsingJobData("IsInOrder", claimSubjectDto.IsInOrder)
                         .Build();
 
                     // 创建一个触发器，设置任务执行时间为24小时后
                     ITrigger trigger = TriggerBuilder.Create()
-                        .WithIdentity("CancelTaskQuartZJob", "group1")
                         .StartAt(DateTimeOffset.UtcNow.AddHours(24))
                         .Build();
 
@@ -2539,13 +2538,11 @@ namespace IRaCIS.Application.Services
                     await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == claimSubjectDto.VisitTaskId, u => new VisitTask() { ClaimUserId = _userInfo.Id }, true);
 
                     IJobDetail job = JobBuilder.Create<CancelTaskQuartZJob>()
-                                                 .WithIdentity($"CancelTaskQuartZJob_{_userInfo.Id}", "group")
                                                 .UsingJobData("VisitTaskId",(Guid) claimSubjectDto.VisitTaskId)  // 传递GUID参数给任务
                                                  .UsingJobData("IsInOrder", claimSubjectDto.IsInOrder).Build();
 
                     // 创建一个触发器，设置任务执行时间为24小时后
                     ITrigger trigger = TriggerBuilder.Create()
-                        .WithIdentity($"CancelTaskQuartZJob_{_userInfo.Id}", "group")
                         .StartAt(DateTimeOffset.UtcNow.AddHours(24))
                         .Build();