diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 6186b51d..586ae5ab 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -1080,12 +1080,13 @@ namespace IRaCIS.Application.Services x.TrialId == taskInfo.TrialId && x.SubjectId == taskInfo.SubjectId && x.ArmEnum== taskInfo.ArmEnum && - x.Id != inDto.VisitTaskId && + x.Id != inDto.VisitTaskId && + x.ReadingCategory == taskInfo.ReadingCategory && + x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned&& x.TaskState==TaskState.Effect&& x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) - .WhereIf(taskInfo.ReadingCategory==ReadingCategory.Visit,x=>x.ReadingCategory==ReadingCategory.Visit||x.ReadingCategory==ReadingCategory.Global) - .WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit,x=>x.ReadingCategory==taskInfo.ReadingCategory) + .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync(); return readingPastResultList; }