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

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

Browse Source
This commit is contained in:
hang
2026-08-27 10:16:53 +08:00
parent e406511755 e4abc61456
commit 20dd2ffd5d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
+4 -4
View File
@@ -452,8 +452,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
zipStream.Position = 0;
var code = string.Concat(currentTask.Subject.Code.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
var subjectCode = (currentTask.BlindSubjectCode.IsNullOrEmpty() ? currentTask.Subject.Code : currentTask.BlindSubjectCode);
var code = string.Concat(subjectCode.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
return new FileStreamResult(zipStream, "application/zip")
{
FileDownloadName = code+"_IVUS_Templates.zip"
@@ -540,8 +540,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
private static string GetTemplateFileName(VisitTask task)
{
var subjectCode = task.Subject.Code;
var fileName = $"{subjectCode}_{task.TaskName}";
var subjectCode = (task.BlindSubjectCode.IsNullOrEmpty() ? task.Subject.Code : task.BlindSubjectCode);
var fileName = $"{subjectCode}_{task.TaskBlindName}";
return string.Concat(fileName.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
}
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+4 -4
View File
@@ -311,8 +311,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
zipStream.Position = 0;
var code = string.Concat(currentTask.Subject.Code.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
var subjectCode = (currentTask.BlindSubjectCode.IsNullOrEmpty() ? currentTask.Subject.Code : currentTask.BlindSubjectCode);
var code = string.Concat(subjectCode.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
return new FileStreamResult(zipStream, "application/zip")
{
FileDownloadName = $"{code}_OCT_FCT_Templates.zip"
@@ -395,8 +395,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
private static string GetTemplateFileName(VisitTask task)
{
var subjectCode = task.Subject.Code;
var fileName = $"{subjectCode}_{task.TaskName}";
var subjectCode = (task.BlindSubjectCode.IsNullOrEmpty() ? task.Subject.Code : task.BlindSubjectCode);
var fileName = $"{subjectCode}_{task.TaskBlindName}";
return string.Concat(fileName.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
}