diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index c57918cb4..e714f73b0 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1002,7 +1002,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc - var list = _noneDicomStudyReposiotry.Where(t => t.IsReading && t.NoneDicomFileList.Any(c => c.IsReading)) + var list = _noneDicomStudyReposiotry.Where(t => t.IsReading) .Where(t => t.SubjectId == subjectId && t.SubjectVisit.CheckState == CheckStateEnum.CVPassed) .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId) //.WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|")) @@ -1034,7 +1034,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc }).OrderBy(t => t.VisitName).ThenBy(t => t.Modality).ToList(); - var noneDicomStudyIdList = list.Select(t => t.Id).ToList(); + var noneDicomStudyIdList = list.Where(t => !(t.Modality != "IVUS" && t.ReadingFileCount == 0)).Select(t => t.Id).ToList(); var noneDicomStudyList = _noneDicomStudyFileReposiotry.Where(t => t.IsReading)