XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Uat_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Uat_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-02-27 14:31:02 +08:00
parent 9a1f4697c2 0998f047e4
commit 45da1645e0
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
View File

@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpGet]
public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(
public async Task<IResponseOutput<List<NoneDicomStudyView>> > 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) ;
}

7
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -161,6 +161,13 @@ 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;
}

2
IRaCIS.Core.Domain/Trial/Trial.cs
View File

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