diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index 1e76770b7..f82a373c9 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -28,7 +28,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, @@ -54,7 +54,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/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 7b21a2efb..7020f74d1 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -161,6 +161,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.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 0ba5fa28e..8abb34608 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 邮件配置