diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index ca734ccae..1478f4e85 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -18,6 +18,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadingTaskDto { + public Guid VisistTaskId { get; set; } public Guid VisistId { get; set; } public Guid SubjectId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 9a033f067..7c8913428 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -62,7 +62,7 @@ namespace IRaCIS.Application.Services { task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == subjectId.Value).Select(x => new GetReadingTaskDto() { - + VisistTaskId=x.Id, ReadingCategory = x.ReadingCategory, VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum @@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services { task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned).Select(x => new GetReadingTaskDto() { - + VisistTaskId = x.Id, ReadingCategory = x.ReadingCategory, VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum @@ -99,7 +99,7 @@ namespace IRaCIS.Application.Services /// /// [HttpPost] - public async Task> GetReadingImageFile(GetReadingImgInDto inDto) + public async Task<(List,object)> GetReadingImageFile(GetReadingImgInDto inDto) { var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId); List visitIds = new List(); @@ -120,7 +120,9 @@ namespace IRaCIS.Application.Services FileName = x.FileName, Path = x.Path }).ToListAsync(); - return imgList; + return (imgList,new { + VisitTaskId= task.VisistTaskId + }); } ///