diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 0acf58872..673c9b6a9 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -620,11 +620,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 //PI 读基线的时候，subject 如果基线没阅片完，SR就不能看
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR && piReadingScopenEnum == PIReadingScopenEnum.AllBaseline,
-                t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned))
+                t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect))
 
                 //PI 读随访的时候， subject 如果基线没阅片完，SR就不能看
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.PI && piReadingScopenEnum == PIReadingScopenEnum.AllVisit,
-                t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect))
+                t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned  && t.TaskState == TaskState.Effect))
+
+
 
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR, t => t.Subject.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
                 // 仅仅SR阅片 PI 没有任务列表
@@ -639,7 +641,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                  t => true)
 
                    .WhereIf(readingDivisionEnum == ReadingDivisionEnum.PIandSR && _userInfo.UserTypeEnumInt == (int)UserTypeEnum.PI && piReadingScopenEnum == PIReadingScopenEnum.AllVisit,
-                 t => t.SourceSubjectVisit.IsBaseLine == false)
+                 t => t.SourceSubjectVisit.IsBaseLine == false )
 
                     .WhereIf(readingDivisionEnum == ReadingDivisionEnum.PIandSR && _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR && piReadingScopenEnum == PIReadingScopenEnum.AllBaseline,
                  t => t.SourceSubjectVisit.IsBaseLine == false)
@@ -653,8 +655,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
                 // 前序 不存在 未一致性核查未通过的  并且前序不存在未完成阅片的有效任务
-                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum ) 
-                && ! t.Subject.SubjectVisitTaskList.Any(tk=>tk.ReadingTaskState!=ReadingTaskState.HaveSigned && tk.TaskState==TaskState.Effect &&tk.VisitTaskNum<t.VisitTaskNum))
+                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum ))
+
+                //.WhereIf(piReadingScopenEnum == PIReadingScopenEnum.AllVisit,t => 
+                //  !t.Subject.SubjectVisitTaskList.Any(tk => tk.ReadingTaskState != ReadingTaskState.HaveSigned && tk.TaskState == TaskState.Effect && tk.VisitTaskNum < t.VisitTaskNum))
+
                 .WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode) && t.IsAnalysisCreate));