From 67f996c47f2c6b68016c4f2e258024e251870836 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 7 Apr 2023 09:25:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Domain/Allocation/VisitTask.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index c7a69efe3..c7e6d215d 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -330,13 +330,13 @@ namespace IRaCIS.Core.Domain.Models
 
         [Projectable]
         [JsonIgnore]
-        public bool IsConvertedTask => Subject.SubjectVisitTaskList.Where(t => (t.TrialReadingCriterionId == TrialReadingCriterionId
+        public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
          && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
          && t.TaskState == TaskState.Effect &&
          t.VisitTaskNum < VisitTaskNum
          && t.IsSelfAnalysis == IsSelfAnalysis
-         && t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null|| IsHistoryConvertedTask
-      ).Any();
+         && t.ArmEnum == ArmEnum
+         ).Any();
 
 
 

From e010732c2fd116c58df2897ce7d3bea0cd3fdcac Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 7 Apr 2023 10:54:26 +0800
Subject: [PATCH 2/3] =?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/ReadingPeriod/ReadModuleService.cs        | 1 +
 IRaCIS.Core.Domain/Allocation/VisitTask.cs                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
index f35bfbe9d..49c6224e2 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
@@ -138,6 +138,7 @@ namespace IRaCIS.Application.Services
                 IsGlobalReading= criterionInfo.IsGlobalReading,
                 IsReadingPeriod=criterionInfo.IsReadingPeriod,
                 ReadingInfoSignTime=criterionInfo.ReadingInfoSignTime,
+                ExistClinicalData=await  _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == dto.TrialReadingCriterionId)),
             }) ;
 
             #endregion
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index c7e6d215d..5e070eb5b 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -332,8 +332,8 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
          && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
-         && t.TaskState == TaskState.Effect &&
-         t.VisitTaskNum < VisitTaskNum
+         && t.TaskState == TaskState.Effect
+         && t.VisitTaskNum < VisitTaskNum
          && t.IsSelfAnalysis == IsSelfAnalysis
          && t.ArmEnum == ArmEnum
          ).Any();

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 3/3] =?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);
+            }