Compare commits

..

No commits in common. "0998f047e45a5cce4e5cff0cb0c9d1b778ddbcec" and "72efd36649c4515e4f71490a52a15a4886e55247" have entirely different histories.

3 changed files with 3 additions and 13 deletions

View File

@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpGet]
public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetNoneDicomStudyList(
public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(
[FromQuery, NotDefault] Guid subjectVisitId,
[FromQuery] Guid? nonedicomStudyId,
[FromQuery] bool isFilterZip,
@ -54,10 +54,7 @@ namespace IRaCIS.Core.Application.Contracts
}
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) ;
return await noneDicomStudyQueryable.ToListAsync();
}

View File

@ -161,13 +161,6 @@ namespace IRaCIS.Core.Application.Contracts
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }
public List<StudyName> StudyNameList { get; set; }
public List<string> ImageFormatList { get; set; }
public bool IsShowStudyName { get; set; } = false;
}

View File

@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// 图像格式
/// </summary>
[StringLength(2000)]
public List<string> ImageFormatList { get; set; } = new List<string>() {"jpg","jpeg","png","bmp","pdf","zip" };
public List<string> ImageFormatList { get; set; } = new List<string>();
#endregion
#region 邮件配置