From 54db21b08db6a84017cd67bc98288e657f078c15 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 16 Mar 2023 16:34:44 +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           | 2 +-
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 264fab680..e4a2862b3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -309,7 +309,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetTaskAdditionalQuestionInDto
     {
-        public Guid TrialReadingCriterionId { get; set; }
+        //public Guid TrialReadingCriterionId { get; set; }
         public Guid VisitTaskId { get; set; }
     }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index b173fde9e..f1377c18d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -135,7 +135,8 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<(List<TrialReadQuestion>,bool)> GetTaskAdditionalQuestion(GetTaskAdditionalQuestionInDto inDto)
         {
-           var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).IgnoreQueryFilters().ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
+            var taskInfo = await _visitTaskRepository.Where(x => inDto.VisitTaskId == x.Id).FirstNotNullAsync();
+            var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId).IgnoreQueryFilters().ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
            return (result,true);
         }