From ee76c858eb6f52c2e47e419563171f0bbec1962d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 17 Jun 2022 16:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/QCOperationService.cs          |  2 --
 .../Reading/ReadingImageTaskService.cs        | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

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
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(List<GetReadingImgOutDto>,object)> GetReadingImageFile(GetReadingImgInDto inDto)
+        public async Task<(List<NoneDicomStudyView>,object)> GetReadingImageFile(GetReadingImgInDto inDto)
         {
             var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId);
             List<Guid> visitIds = new List<Guid>();
@@ -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<GetReadingImgOutDto> 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<NoneDicomStudyView> result=await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId))
+
+                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
+
+        
+            return (result, new  { 
             VisitTaskId= task.VisistTaskId
             });
         }