diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs index 37a8f027b..98640957f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs @@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public string TaskName { get; set; } + public Guid? SourceSubjectVisitId { get; set; } + public PackState PackState { get; set; } + public List OrginalStudyList { get; set; } public List UploadStudyList { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 48f2a8258..bcf7fa04f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -37,25 +37,29 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc /// /// /// - public async Task >> GetSubjectImageUploadList(Guid subjectId) + public async Task>> GetSubjectImageUploadList(Guid subjectId) { - var query=_repository.Where(t=>t.Id==subjectId) - .Select(u=>new SubjectImageUploadDTO() + var query = _repository.Where(t => t.Id == subjectId && t.SourceSubjectVisitId != null) + .Select(u => new SubjectImageUploadDTO() { - SubejctId=u.SubjectId, - SubjectCode=u.IsSelfAnalysis==true? u.Subject.Code:u.BlindSubjectCode, - TaskBlindName=u.TaskBlindName, - TaskName=u.TaskName, - OrginalStudyList=u.SourceSubjectVisit.StudyList.Select(t=>new StudyBasicInfo() + SubejctId = u.SubjectId, + SubjectCode = u.IsSelfAnalysis == true ? u.Subject.Code : u.BlindSubjectCode, + TaskBlindName = u.TaskBlindName, + TaskName = u.TaskName, + + SourceSubjectVisitId = u.SourceSubjectVisitId, + PackState = u.SourceSubjectVisit.PackState, + + OrginalStudyList = u.SourceSubjectVisit.StudyList.Select(t => new StudyBasicInfo() { - Id=t.Id, - Description=t.Description, - InstanceCount=t.InstanceCount, - Modalities=t.Modalities, - SeriesCount=t.SeriesCount, + Id = t.Id, + Description = t.Description, + InstanceCount = t.InstanceCount, + Modalities = t.Modalities, + SeriesCount = t.SeriesCount, }).ToList(), - UploadStudyList=u.TaskStudyList.Select(t => new StudyBasicInfo() + UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo() { Id = t.Id, Description = t.Description, @@ -66,7 +70,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc }) ; - var list =await query.ToListAsync(); + var list = await query.ToListAsync(); return ResponseOutput.Ok(list); } @@ -79,7 +83,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc /// /// - public async Task RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true) + public async Task RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true) { var subjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);