diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 7e42bde7c..8bb000467 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1193,8 +1193,6 @@ namespace IRaCIS.Core.Application.Image.QA dbSubjectVisit.AuditState = AuditStateEnum.ToAudit; } - - } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 7c8913428..f230c8eaa 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -99,7 +99,7 @@ namespace IRaCIS.Application.Services /// /// [HttpPost] - public async Task<(List,object)> GetReadingImageFile(GetReadingImgInDto inDto) + public async Task<(List,object)> GetReadingImageFile(GetReadingImgInDto inDto) { var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId); List visitIds = new List(); @@ -112,15 +112,15 @@ namespace IRaCIS.Application.Services // 阅片期取前面所有的图像 visitIds.AddRange(await _subjectVisitRepository.Where(x => x.VisitNum <= task.VisitNum && x.SubjectId == task.SubjectId).Select(x => x.Id).ToListAsync()); } - - - List imgList = await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId)) - .SelectMany(x => x.NoneDicomFileList).Select(x => new GetReadingImgOutDto() - { - FileName = x.FileName, - Path = x.Path - }).ToListAsync(); - return (imgList,new { + + + + List result=await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId)) + + .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync(); + + + return (result, new { VisitTaskId= task.VisistTaskId }); }