diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index d627136b1..150d90103 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -453,7 +453,7 @@ namespace IRaCIS.Core.Application.Contracts public class TaskNoneDicomStudyDTO : NoneDicomStudyBasicInfo { - + public Guid VisitTaskId { get; set; } public int UploadedFileCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 4a56736c3..2838c683a 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1016,6 +1016,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc TaskBlindName = u.TaskBlindName, TaskName = u.TaskName, SourceSubjectVisitId = u.SourceSubjectVisitId, + VisitTaskId=u.Id, Id = ns.Id, Description = ns.Description, @@ -1037,16 +1038,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var list = await query.Where(t => t.SubjectCode == inQuery.SubjectCode).SortToListAsync(inQuery); - var noneDicomStudyIdList = list.Select(t => t.Id).ToList(); + var noneDicomStudyTaskIdList = list.Select(t => t.VisitTaskId).ToList(); - var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyIdList.Contains(t.Id)) - .SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyIdList.Contains((Guid)t.VisitTaskId)) + var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyTaskIdList.Contains(t.Id)) + .SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyTaskIdList.Contains((Guid)t.VisitTaskId)) .Select(u => new NoneDicomFileInfo { OriginNoneDicomStudyId = u.OriginNoneDicomStudyId, - FileType=u.FileType + FileType=u.FileType, FileName = u.FileName, FileSize = u.FileSize, Path = u.Path