IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -1332,7 +1332,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             if (inQuery.IsImageSegmentLabel == true)
             {
-                var list = await _subjectVisitRepository.Where(t => t.CheckState == CheckStateEnum.CVPassed)
+                var list = await _subjectVisitRepository
                   .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
                   .ProjectTo<SubjectVisitMarkStudyDto>(_mapper.ConfigurationProvider).ToListAsync();
 
@@ -1407,7 +1407,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 }
 
                 var query = _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                        && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.DoctorUserId == doctorUserId)
+                                                        && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId)
                     //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
                     .WhereIf(inQuery.VisitTaskId == null, t => t.TaskState == TaskState.Effect)//从待阅列表进入，要筛选出有效的，任务可能重阅了，也要看到该任务的
                     .WhereIf(criterionInfo.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)