From c0c4df1254f0bdc4c430676b5158cf10d3610f63 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 26 Aug 2026 14:51:13 +0800 Subject: [PATCH] =?UTF-8?q?IVUS=E5=92=8COCT=20=E7=A0=B4=E7=9B=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/IVUSCalculateService.cs | 8 ++++---- .../Service/ReadingCalculate/OCTCalculateService.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 5ca9dc6ba..329a4f2d7 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -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)); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 17e570645..46359c855 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -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)); }