新增文档查询接口

Test_IRC_Net8^2
hang 2025-08-12 13:59:43 +08:00
parent 12376a154e
commit 7f6b6010f2
3 changed files with 13 additions and 11 deletions

View File

@ -49,9 +49,8 @@ namespace IRaCIS.Core.Application.Helper
public static class DicomDIRHelper public static class DicomDIRHelper
{ {
public static async Task<Dictionary<string, string>> GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, string ossFolder, IOSSService _oSSService) public static async Task GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, Dictionary<string, string> dic, string ossFolder, IOSSService _oSSService)
{ {
var dic = new Dictionary<string, string>();
var mappings = new List<string>(); var mappings = new List<string>();
int index = 1; int index = 1;
@ -145,9 +144,6 @@ namespace IRaCIS.Core.Application.Helper
#endregion #endregion
} }
return dic;
} }

View File

@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
/// 系统模板文档配置表 /// 系统模板文档配置表
/// </summary> /// </summary>
[ApiExplorerSettings(GroupName = "Common")] [ApiExplorerSettings(GroupName = "Common")]
public class CommonDocumentService(IRepository<CommonDocument> _commonDocumentRepository, public class CommonDocumentService(IRepository<CommonDocument> _commonDocumentRepository,
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ICommonDocumentService IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ICommonDocumentService
{ {
@ -36,6 +36,14 @@ namespace IRaCIS.Core.Application.Service
return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument); return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
} }
[HttpGet]
public async Task<CommonDocument> GetCommonDocument(string code)
{
var find = await _commonDocumentRepository.Where(t => t.Code == code).FirstOrDefaultAsync();
return find;
}
public async Task<IResponseOutput> AddOrUpdateCommonDocument(CommonDocumentAddOrEdit addOrEditCommonDocument) public async Task<IResponseOutput> AddOrUpdateCommonDocument(CommonDocumentAddOrEdit addOrEditCommonDocument)
{ {

View File

@ -832,9 +832,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{pathInfo.VisitId}/{item.Key.StudyInstanceUid}"; var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{pathInfo.VisitId}/{item.Key.StudyInstanceUid}";
var (isSucess, dic) = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), ossFolder, _oSSService)); var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
dirDic = dic;
if (isSucess) if (isSucess)
{ {
@ -1141,9 +1140,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{visitId}/{item.Key.StudyInstanceUid}"; var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{visitId}/{item.Key.StudyInstanceUid}";
var (isSucess, dic) = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), ossFolder, _oSSService)); var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
dirDic = dic;
if (isSucess) if (isSucess)
{ {
@ -1181,7 +1179,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
InstanceList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new DownloadDicomInstanceDto() InstanceList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new DownloadDicomInstanceDto()
{ {
IsEncapsulated=k.IsEncapsulated, IsEncapsulated = k.IsEncapsulated,
InstanceId = k.Id, InstanceId = k.Id,
FileName = string.Empty, FileName = string.Empty,
Path = k.Path, Path = k.Path,