没有生成dir 继续下载
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
e488ba5edd
commit
0fdbb5dde0
|
|
@ -1054,18 +1054,22 @@ namespace IRaCIS.Core.API.Controllers
|
||||||
|
|
||||||
Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}");
|
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 dicomDirPath = $"{visit.SubjectCode}_{visit.VisitName}/{studyTime}_{modalitysStr}/DICOMDIR";
|
||||||
var dicomDirEntry = zip.CreateEntry(dicomDirPath, CompressionLevel.Fastest);
|
var dicomDirEntry = zip.CreateEntry(dicomDirPath, CompressionLevel.Fastest);
|
||||||
|
|
||||||
await using (var entryStream = dicomDirEntry.Open())
|
Log.Logger.Warning($"DIRPath: {study.StudyDIRPath}");
|
||||||
await using (var dirStream = await _oSSService.GetStreamFromOSSAsync(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 ----------
|
// ---------- IMAGE FILES ----------
|
||||||
foreach (var series in study.SeriesList)
|
foreach (var series in study.SeriesList)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue