From 548d9cd820c7c6ac4fb9664b0cc09935a01af044 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 7 Apr 2023 11:48:29 +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

---
 .../ReadingCalculate/General/GeneralCalculateService.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 18d31f91c..4644a978a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -283,7 +283,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<List<VisitTaskInfo>> GetReadingReportTaskList(Guid visitTaskId)
         {
-            var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+            var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
 
             var isAdditionalQuestionId = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == visitTaskInfo.TrialReadingCriterionId && x.IsAdditional).IgnoreQueryFilters().Select(x => x.Id).ToListAsync();
 
@@ -302,7 +302,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 taskquery = _visitTaskRepository.Where(x => visitTaskInfo.ReportRelatedTaskIdList.Contains(x.Id)||x.Id==visitTaskInfo.Id);
             }
-
+            if (!visitTaskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
+            {
+                taskquery = _visitTaskRepository.Where(x =>  x.Id == visitTaskInfo.Id);
+            }