diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index 6ea1bd7f4..e5836e1df 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -122,6 +122,7 @@ namespace IRaCIS.Application.Services x.IsOncologyReading, x.IsGlobalReading, x.IsReadingPeriod, + x.ReadingInfoSignTime, }).FirstNotNullAsync(); return (pageOutput, new @@ -135,7 +136,7 @@ namespace IRaCIS.Application.Services IsExistsReadingClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.ImageRead && x.IsConfirm), IsGlobalReading= criterionInfo.IsGlobalReading, IsReadingPeriod=criterionInfo.IsReadingPeriod, - + ReadingInfoSignTime=criterionInfo.ReadingInfoSignTime, }) ; #endregion diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index 753201768..8e6c40356 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application.Triggers if (!subjectVisit.IsBaseLine) { - var criterionList = await _repository.Where(x => x.TrialId == trialId && x.IsConfirm && x.IsReadingPeriod && x.IsReadingTaskViewInOrder).ToListAsync(); + var criterionList = await _repository.Where(x => x.TrialId == trialId&&x.ReadingInfoSignTime!=null && x.IsConfirm && x.IsReadingPeriod && x.IsReadingTaskViewInOrder).ToListAsync(); foreach (var item in criterionList) { //ReadingPeriodSet? readingPeriodSet = await _readingPeriodSetRepository.FirstOrDefaultNoTrackingAsync(x => x.TrialId == trialId && x.IsGlobal && x.TrialReadingCriterionId == item.Id);