From 819a6a0b0761333faa5045cb23e0a3aa92a2d5ea Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 17 Jun 2022 15:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs   |  1 +
 .../Service/Reading/ReadingImageTaskService.cs         | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

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
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<GetReadingImgOutDto>> GetReadingImageFile(GetReadingImgInDto inDto)
+        public async Task<(List<GetReadingImgOutDto>,object)> GetReadingImageFile(GetReadingImgInDto inDto)
         {
             var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId);
             List<Guid> visitIds = new List<Guid>();
@@ -120,7 +120,9 @@ namespace IRaCIS.Application.Services
                    FileName = x.FileName,
                    Path = x.Path
                }).ToListAsync();
-            return imgList;
+            return (imgList,new  { 
+            VisitTaskId= task.VisistTaskId
+            });
         }
 
         /// <summary>