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] =?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();