From 35ba7861d114be29bfcc2dc170a4526038b2b613 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 29 Feb 2024 17:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingOncologyTaskService.cs             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index f39336c3a..b4efec01f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -156,17 +156,17 @@ namespace IRaCIS.Application.Services
             {
                 // 按照全局那边的查询法
 				globalVisits =await _visitTaskRepository.Where(x =>
-				   x.TrialId == taskInfo.TrialId &&
-				   x.SubjectId == taskInfo.SubjectId &&
+				   x.TrialId == globalOrVisitTaskInfo.TrialId &&
+				   x.SubjectId == globalOrVisitTaskInfo.SubjectId &&
 				   x.ReadingCategory == ReadingCategory.Visit &&
-				   x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
+				   x.TrialReadingCriterionId == globalOrVisitTaskInfo.TrialReadingCriterionId &&
 				   x.ReadingTaskState == ReadingTaskState.HaveSigned &&
-				   x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
-				   x.ArmEnum == taskInfo.ArmEnum &&
-				   x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
-				   x.DoctorUserId == taskInfo.DoctorUserId &&
+				   x.IsAnalysisCreate == globalOrVisitTaskInfo.IsAnalysisCreate &&
+				   x.ArmEnum == globalOrVisitTaskInfo.ArmEnum &&
+				   x.IsSelfAnalysis == globalOrVisitTaskInfo.IsSelfAnalysis &&
+				   x.DoctorUserId == globalOrVisitTaskInfo.DoctorUserId &&
 				   x.TaskState == TaskState.Effect &&
-				   x.VisitTaskNum < globalOrVisitTaskInfo.VisitTaskNum)
+				   x.VisitTaskNum <= globalOrVisitTaskInfo.VisitTaskNum)
 				  .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
 				  {
 					  VisitName = x.TaskName,
@@ -174,7 +174,7 @@ namespace IRaCIS.Application.Services
 					  VisitTaskId = x.Id,
 					  IsConvertedTask = x.IsConvertedTask,
 					  IsFirstChangeTask = x.IsConvertedTask && x.BeforeConvertedTaskId != null,
-					  ArmEnum = taskInfo.ArmEnum,
+					  ArmEnum = globalOrVisitTaskInfo.ArmEnum,
 					  VisitNum = x.SourceSubjectVisit.VisitNum,
 					  IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
 					  VisitId = x.SourceSubjectVisitId!.Value,
@@ -184,7 +184,7 @@ namespace IRaCIS.Application.Services
 						  Count = x.ToList().Count()
 					  }).ToList(),
 					  //CrterionDictionaryGroup=  x.CrterionDictionaryGroup,
-					  BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType != GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
+					  AfterQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType != GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
 				  .Select(y => new GlobalQuestionInfo()
 				  {