diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 38873397b..ce35fb4eb 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1475,6 +1475,21 @@ 阅片期名称 + + + 标准ID + + + + + 标准 + + + + + 是否启用 + + 项目外部人员 录入流程相关 @@ -3776,6 +3791,18 @@ + + + 阅片问题.标准 + + + + + 新增修改 + + + + 生成的阅片模块(在大列表上展示的) 阅片期 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index aff3c087a..f85137bf3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -315,7 +315,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 项目ID /// - public Guid? TrialId { get; set; } + public Guid TrialId { get; set; } /// /// 阅片期名称 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index a6c3a759f..2f9a58b01 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -26,6 +26,7 @@ namespace IRaCIS.Application.Services private readonly IRepository _subjectRepository; private readonly IRepository _visitstageRepository; private readonly IRepository _userRepository; + private readonly IRepository _trialRepository; private readonly IRepository _readModuleViewRepository; private readonly IRepository _dicomInstanceRepository; private readonly IRepository _noneDicomStudyFileRepository; @@ -37,6 +38,7 @@ namespace IRaCIS.Application.Services IRepository subjectRepository, IRepository visitstageRepository, IRepository UserRepository, + IRepository trialRepository, IRepository readModuleViewRepository, IRepository dicomInstanceRepository, IRepository noneDicomStudyFileRepository, @@ -48,6 +50,7 @@ namespace IRaCIS.Application.Services this._subjectRepository = subjectRepository; this._visitstageRepository = visitstageRepository; this._userRepository = UserRepository; + this._trialRepository = trialRepository; this._readModuleViewRepository = readModuleViewRepository; this._dicomInstanceRepository = dicomInstanceRepository; this._noneDicomStudyFileRepository = noneDicomStudyFileRepository; @@ -183,7 +186,8 @@ namespace IRaCIS.Application.Services }); return (pageOutput, new { - MaxLength = maxcount + MaxLength = maxcount, + IsClinicalReading = await _trialRepository.Where(x => x.Id == dto.TrialId).Select(x => x.IsClinicalReading).FirstOrDefaultAsync() }); #endregion