From 45ef45cfea9c3367450c4c6ed147083108f03e02 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Oct 2022 17:51:06 +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

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index f6d0e06d5..8a3daa738 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -63,7 +63,7 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadingCriterionPage> readingCriterionPageRepository,
                   IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
                   IRepository<ReadModule> readModuleRepository,
-                    IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
+                  IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
                   IRepository<TumorAssessment> tumorAssessmentRepository,
                   IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
                   IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
@@ -128,7 +128,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto)
         {
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
 
             if (taskInfo.TaskState != TaskState.Effect)
             {
@@ -158,7 +158,10 @@ namespace IRaCIS.Application.Services
 
                 }).OrderBy(x => x.VisitTaskNum).ToListAsync();
 
-
+            if (!taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
+            {
+                result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
+            }
 
             return (result, new
             {