From 6bfbd3109b6e61a7fed5f66bd24fd3c3a416f2dc Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 21 Jul 2022 11:03:09 +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

---
 .../Service/Reading/ReadingImageTaskService.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 616797bcc..80309d7e8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -154,7 +154,7 @@ namespace IRaCIS.Application.Services
             };
 
             result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                 x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate && x.VisitTaskNum < taskInfo.VisitTaskNum)
+                 x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&(x.TaskState==TaskState.Effect||x.TaskState==TaskState.HaveReturned) && x.VisitTaskNum < taskInfo.VisitTaskNum)
                 .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
                 {
                     VisitName = x.SourceSubjectVisit.VisitName,
@@ -197,7 +197,7 @@ namespace IRaCIS.Application.Services
                     Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.QuestionId == null).Select(x => x.Answer).FirstOrDefault() ?? String.Empty,
                     QuestionName = "原因",
                     Type = "input",
-                    QuestionId=default(Guid),
+                  
 
                 };