diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index bb7517717..a022b4e43 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -1054,18 +1054,22 @@ namespace IRaCIS.Core.API.Controllers Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}"); - try + if (study.StudyDIRPath.IsNotNullOrEmpty()) { - await using (var entryStream = dicomDirEntry.Open()) - await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath)) + + + try { - await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken); + await using (var entryStream = dicomDirEntry.Open()) + await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath)) + { + await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken); + } + } + catch (Exception ex) + { + Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}"); } - } - catch (Exception ex) - { - Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}"); - continue; } @@ -2076,12 +2080,27 @@ namespace IRaCIS.Core.API.Controllers var dicomDirPath = $"{visit.SubjectCode}_{visit.VisitName}/{studyTime}_{modalitysStr}/DICOMDIR"; var dicomDirEntry = zip.CreateEntry(dicomDirPath, CompressionLevel.Fastest); - await using (var entryStream = dicomDirEntry.Open()) - await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath)) + Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}"); + + if (study.StudyDIRPath.IsNotNullOrEmpty()) { - await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken); + + + try + { + await using (var entryStream = dicomDirEntry.Open()) + await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(study.StudyDIRPath)) + { + await dirStream.CopyToAsync(entryStream, 32 * 1024, abortToken); + } + } + catch (Exception ex) + { + Log.Logger.Warning($"处理文件{study.StudyCode}DIR失败: {ex.Message}"); + } } + // ---------- IMAGE FILES ---------- foreach (var series in study.SeriesList) { diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index e258c7c15..d3d7cc6f0 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -647,7 +647,7 @@ namespace IRaCIS.Core.Application.Service [UnitOfWork] public async Task Get([FromServices] IOptionsMonitor _encreptResponseMonitor) - { + { var _IRCEncreptOption = _encreptResponseMonitor.CurrentValue; var publicKey = Encoding.UTF8.GetString(Convert.FromBase64String(_IRCEncreptOption.Base64RSAPublicKey));