From 522d7eca0700be843fc77cb4767eec34b1b43539 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 20 Jun 2022 15:39:59 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs    | 13 +++++++++++++
 .../Service/Reading/ReadingImageTaskService.cs  | 17 ++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e8aa18592..639ab8a4b 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -79,6 +79,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string QuestionName { get; set; }
 
         public string AnswerGroup { get; set; }
+
+      
     }
 
     public class GetTrialCriterionJudgeQuestionListInDto
@@ -128,6 +130,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     //    List<GetTrialReadingQuestionOutDto> Questions { get; set; }
     //}
 
+    public class TaskAnswerDto
+    {
+        public Guid VisitTaskId { get; set; }
+
+        public Guid QuestionId { get; set; }
+
+        public string Answer { get; set; }
+
+        public string AnswerGroup { get; set; }
+    }
+
     public class GetTrialReadingQuestionOutDto
     {
         public Guid ReadingQuestionTrialId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index b23d0e8cf..3d988bafd 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -224,7 +224,7 @@ namespace IRaCIS.Application.Services
                        Answer= leftquestionAnswer.Answer
                      };
 
-            var qusetionList =await query.ToListAsync();
+            var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync();
 
         
 
@@ -311,9 +311,20 @@ namespace IRaCIS.Application.Services
         {
             var visitTask = await _visitTaskRepository.Where(x => x.Id == VisitTaskId).FirstOrDefaultAsync();
             var visitTaskList = await _visitTaskRepository.Where(x =>x.ReadingTaskState== ReadingTaskState.HaveSigned&& x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).ToListAsync();
-            if (visitTaskList.Count == 0)
+            var visitTaskids = visitTaskList.Select(x => x.Id).ToList();
+            if (visitTaskList.Count == 2)
             {
-                
+                var query =  from questionAnswet  in _readingTaskQuestionAnswerRepository.Where(x=> visitTaskids.Contains(x.VisitTaskId))
+                             join question in _readingQuestionTrialRepository.Where(x=>x.IsJudgeQuestion) on  new { ReadingQuestionTrialId= questionAnswet.ReadingQuestionTrialId } equals  new { ReadingQuestionTrialId= question.Id }
+                             select new TaskAnswerDto()
+                             {
+                                Answer= questionAnswet.Answer,
+                                AnswerGroup= question.AnswerGroup,
+                                QuestionId= question.Id,
+                                VisitTaskId= questionAnswet.VisitTaskId,
+                             };
+
+               
             }
         }