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

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

Browse Source
This commit is contained in:
he
2025-08-12 16:19:12 +08:00
parent b3ed2dd497 5cfa209cc2
commit 5186a530f8
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
+9 -1
View File
@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
/// 系统模板文档配置表
/// </summary>
[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
{
@@ -36,6 +36,14 @@ namespace IRaCIS.Core.Application.Service
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)
{
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+3 -5
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 (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)
{
@@ -1141,9 +1140,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
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)
{
@@ -1181,7 +1179,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
InstanceList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new DownloadDicomInstanceDto()
{
IsEncapsulated=k.IsEncapsulated,
IsEncapsulated = k.IsEncapsulated,
InstanceId = k.Id,
FileName = string.Empty,
Path = k.Path,