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

Test_IRC_Net10
he 2026-04-28 14:23:42 +08:00
parent 372c6d5e0d eca91b139b
commit f3d70c0d12
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
View File

@ -112,12 +112,24 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var prefix = path.Substring(1, path.LastIndexOf('/') - 1); var prefix = path.Substring(1, path.LastIndexOf('/') - 1);
//每次都用一个新的名字 //每次都用一个新的名字
var maskFileName = $"{Path.GetFileName(path)}.{batchId}_MaskDicom"; var maskFileName = string.Empty;
if (path.Contains("_MaskDicom")) if (path.Contains(".MaskDicom_"))
{ {
//清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要 //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
await _oSSService.DeleteFromPrefix(path, true); //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要 await _oSSService.DeleteFromPrefix(path, true); //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
//本身就是遮盖的图，那么就要要替换guid
var length = Guid.Empty.ToString().Length + ".MaskDicom_".Length ;
var restorePath = item.Path[..^length];
maskFileName = $"{Path.GetFileName(restorePath)}.MaskDicom_{batchId}";
}
else
{
//没有遮盖的，直接加上.批次_MaskDicom
maskFileName = $"{Path.GetFileName(path)}.MaskDicom_{batchId}";
} }
await _oSSService.UploadToOSSAsync(outPutStream, prefix, maskFileName, false); await _oSSService.UploadToOSSAsync(outPutStream, prefix, maskFileName, false);
@ -174,11 +186,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
foreach (var item in idPathList) foreach (var item in idPathList)
{ {
if (item.Path.EndsWith("_MaskDicom")) if (item.Path.Contains(".MaskDicom_"))
{ {
await _oSSService.DeleteFromPrefix(item.Path, true); await _oSSService.DeleteFromPrefix(item.Path, true);
var length = Guid.Empty.ToString().Length + "_MaskDicom".Length + 1; var length = Guid.Empty.ToString().Length + ".MaskDicom_".Length;
var newPath = item.Path[..^length]; var newPath = item.Path[..^length];
okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath }); okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath });
@ -186,16 +198,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false }); await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false });
} }
if (item.Path.EndsWith(".")) //if (item.Path.EndsWith("."))
{ //{
await _oSSService.DeleteFromPrefix(item.Path, true); // await _oSSService.DeleteFromPrefix(item.Path, true);
var newPath = item.Path[..^1]; // var newPath = item.Path[..^1];
okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath }); // okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath });
await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false }); // await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false });
} //}
} }