diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index dd1ec03fa..4f70f7527 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -502,9 +502,12 @@ namespace IRaCIS.Application.Services x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && x.TaskState == TaskState.Effect && - x.VisitTaskNum <= taskInfo.VisitTaskNum && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && - x.ReadingCategory == ReadingCategory.Visit) || x.Id == inDto.VisitTaskId); + x.ReadingCategory == ReadingCategory.Visit) || x.Id == inDto.VisitTaskId) + .WhereIf(taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom,x=> x.VisitTaskNum <= taskInfo.VisitTaskNum); + + + if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned) {