diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 3d6e788c2..51186ab88 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -877,6 +877,7 @@ namespace IRaCIS.Application.Services IsMustGlobalReading = systemCriterion.IsMustGlobalReading, IseCRFShowInDicomReading=systemCriterion.IseCRFShowInDicomReading, IsGlobalReading = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsGlobalReading, + IsReadingPeriod = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsReadingPeriod, }) ; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 9ec954693..b816288b4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -410,7 +410,7 @@ namespace IRaCIS.Application.Services var readModule = await _readModuleRepository.Where(x => x.SubjectVisitId == taskinfo.SourceSubjectVisitId && x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync(); - if (criterion.IsGlobalReading && !criterion.IsGlobalTask && readModule != null) + if (criterion.IsReadingPeriod && !criterion.IsGlobalReading && readModule != null) { return true; } @@ -456,7 +456,7 @@ namespace IRaCIS.Application.Services x.IsArbitrationReading, x.ArbitrationRule, x.IsGlobalReading, - x.IsGlobalTask, + x.IsReadingPeriod, }).FirstNotNullAsync(); var noteEqual = false; @@ -676,7 +676,7 @@ namespace IRaCIS.Application.Services (visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Visit) ||(visitTask.SouceReadModuleId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading) // 全局访视任务仲裁 - ||(visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading&& criterionInfo.IsGlobalReading&&!criterionInfo.IsGlobalTask) + ||(visitTask.SourceSubjectVisitId != null && criterionInfo.ArbitrationRule == ArbitrationRule.Reading&& criterionInfo.IsReadingPeriod&&!criterionInfo.IsGlobalReading) ) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index e5b910015..6076f50d2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -115,6 +115,7 @@ namespace IRaCIS.Application.Services x.IsReadingTaskViewInOrder, x.IsOncologyReading, x.IsGlobalReading, + x.IsReadingPeriod, }).FirstNotNullAsync(); return (pageOutput, new @@ -127,6 +128,7 @@ namespace IRaCIS.Application.Services IsExistsVisitClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.SubjectVisit && x.IsConfirm), IsExistsReadingClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == dto.TrialId && x.ClinicalDataLevel == ClinicalLevel.ImageRead && x.IsConfirm), IsGlobalReading= criterionInfo.IsGlobalReading, + IsReadingPeriod=criterionInfo.IsReadingPeriod, }) ; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 8fe7a38d9..fafa48299 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -804,9 +804,9 @@ namespace IRaCIS.Core.Application.Contracts public bool IseCRFShowInDicomReading { get; set; } /// - /// 是否有全局阅片任务 + /// 是否有阅片期 /// - public bool IsGlobalTask { get; set; } = true; + public bool IsReadingPeriod { get; set; } = true; public string GlobalUpdateType { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 4d82dd1a0..de3b96352 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -460,7 +460,7 @@ namespace IRaCIS.Core.Application await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial() { ReadingTool=inDto.ReadingTool, - IsGlobalTask=inDto.IsGlobalTask, + IsReadingPeriod=inDto.IsReadingPeriod, //DigitPlaces=inDto.DigitPlaces, IsReadingTaskViewInOrder =inDto.IsReadingTaskViewInOrder, ReadingTaskViewEnum = inDto.ReadingTaskViewEnum, diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index 03d28c4db..5187469b0 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Triggers if (!subjectVisit.IsBaseLine) { - var criterionList = await _repository.Where(x => x.TrialId == trialId && x.IsConfirm && x.IsGlobalReading && x.IsReadingTaskViewInOrder).ToListAsync(); + var criterionList = await _repository.Where(x => x.TrialId == trialId && 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); diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 4e1269f1f..98b3346c4 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -167,15 +167,18 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + + /// - /// 阅片期 + /// 是否有阅片期 + /// + public bool IsReadingPeriod { get; set; } = true; + + /// + /// 是否生成全局阅片任务 /// public bool IsGlobalReading { get; set; } = true; - /// - /// 是否有全局阅片任务 - /// - public bool IsGlobalTask { get; set; } = true; /// /// 仲裁阅片