diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index e5966faa2..6e9119f8e 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Contracts [HttpGet] - public async Task> GetNoneDicomStudyList( + public async Task> > GetNoneDicomStudyList( [FromQuery, NotDefault] Guid subjectVisitId, [FromQuery] Guid? nonedicomStudyId, [FromQuery] bool isFilterZip, @@ -63,7 +63,10 @@ namespace IRaCIS.Core.Application.Contracts } - return await noneDicomStudyQueryable.ToListAsync(); + var list = await noneDicomStudyQueryable.ToListAsync(); + + var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync(); + return ResponseOutput.Ok(list, config) ; } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index b5c3fdc10..45b227e61 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -15,6 +15,8 @@ namespace IRaCIS.Core.Application.Contracts public bool IsCriticalSequence { get; set; } = false; + public string StudyName { get; set; } + public List NoneDicomStudyFileList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 0b834efa9..6503dfbe7 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -18,6 +18,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO public int Type { get; set; } + public string StudyName { get; set; } = String.Empty; + public string Modality { get; set; } = String.Empty; public string BodyPart { get; set; } = String.Empty; @@ -386,6 +388,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO public string BodyPartForEdit { get; set; } = String.Empty; + public string StudyName { get; set; } = string.Empty; + public string ModalityForEdit { get; set; } = string.Empty; public bool IsHaveUploadFailed { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 6d1d5c761..881ff6f10 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -166,6 +166,13 @@ namespace IRaCIS.Core.Application.Contracts [Comment("阅片任务产生之前 采集影像")] public CollectImagesType CollectImagesEnum { get; set; } + public List StudyNameList { get; set; } + + + public List ImageFormatList { get; set; } + + public bool IsShowStudyName { get; set; } = false; + } diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 8e099415b..97c8021d1 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -824,6 +824,8 @@ namespace IRaCIS.Core.Application.Image.QA study.BodyPartForEdit = updateModalityCommand.BodyPart; study.ModalityForEdit = updateModalityCommand.Modality; + study.StudyName = updateModalityCommand.StudyName; + await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.StudyId == studyId, r => new DicomSeries() { BodyPartForEdit = updateModalityCommand.BodyPart }); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 04e6c7e6b..26162b4ae 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -69,6 +69,23 @@ namespace IRaCIS.Core.Application.Contracts public List ModalityList { get; set; } = new List(); + /// + /// 是否显示检查名称 + /// + public bool IsShowStudyName { get; set; } = false; + + /// + /// 检查名称列表 + /// + public List StudyNameList { get; set; } + + /// + /// 图像格式 + /// + [StringLength(2000)] + public List ImageFormatList { get; set; } = new List(); + + public List TrialObjectNameList { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 1312b3857..41799a768 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity /// 图像格式 /// [StringLength(2000)] - public List ImageFormatList { get; set; } = new List(); + public List ImageFormatList { get; set; } = new List() {"jpg","jpeg","png","bmp","pdf","zip" }; #endregion #region 邮件配置 @@ -325,6 +325,11 @@ public class StudyName /// 名称 /// public string Name { get; set; } + + /// + /// 英文名称 + /// + public string EnName { get; set; } } [ComplexType]