From 45db942f661783af647c8f4dc10453706da135b7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 1 Jun 2026 15:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/TrialImageDownloadService.cs        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs b/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
index 8cac5500d..dab64d426 100644
--- a/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
+++ b/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
@@ -276,13 +276,17 @@ namespace IRaCIS.Core.Application.Service
 
                 Log.Logger.Warning($"download_log.csv访视数量：{existVisits.Count}");
 
+                Log.Logger.Warning($"csv排除前需要下载数量：{acturalDownList.Count}");
+
                 acturalDownList = acturalDownList.Where(t => !existVisits.Any(old => old.VisitNum == t.VisitNum && old.SubjectCode == t.SubjectCode &&
                old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList();
 
+                Log.Logger.Warning($"csv排除后需要下载数量：{acturalDownList.Count}");
+
 
             }
 
-            acturalDownList = acturalDownList.Skip(startIndex - 1).Take(endIndex).ToList();
+            acturalDownList = acturalDownList.Skip(startIndex - 1).Take(endIndex - startIndex + 1).ToList();
 
             Log.Logger.Warning($"该区{startIndex}-{endIndex} 实际需要下载访视数量：{acturalDownList.Count}");
 
@@ -319,7 +323,7 @@ namespace IRaCIS.Core.Application.Service
                     // 遍历 Series
                     foreach (var seriesInfo in studyInfo.SeriesList)
                     {
-                        string studyDicomFolderPath = Path.Combine(trialFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}", $"{studyInfo.StudyCode}_{studyInfo.StudyTime?.ToString("yyyy-MM-dd")}_{seriesInfo.Modality}");
+                        string studyDicomFolderPath = Path.Combine(trialFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName.Trim()}", $"{studyInfo.StudyCode}_{studyInfo.StudyTime?.ToString("yyyy-MM-dd")}_{seriesInfo.Modality}");
 
                         // 创建 影像 文件夹
                         Directory.CreateDirectory(studyDicomFolderPath);
@@ -333,7 +337,7 @@ namespace IRaCIS.Core.Application.Service
 
                             downloadJobs.Add(new DownloadJob()
                             {
-                                Name = $"{visitItem.SubjectCode}_{visitItem.VisitNum}_{visitItem.VisitName}_DICOM_{destinationPath}",
+                                Name = $"{visitItem.SubjectCode}_{visitItem.VisitNum}_{visitItem.VisitName.Trim()}_DICOM_{destinationPath}",
 
                                 Action = async () =>
                             {
@@ -381,11 +385,11 @@ namespace IRaCIS.Core.Application.Service
 
 
                 //建立压缩包
-                string visitFolderPath = Path.Combine(trialFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}");
+                string visitFolderPath = Path.Combine(trialFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName.Trim()}");
 
                 downloadJobs.Add(new DownloadJob()
                 {
-                    Name = $"{visitItem.SubjectCode}_{visitItem.VisitName}_Zip",
+                    Name = $"{visitItem.SubjectCode}_{visitItem.VisitName.Trim()}_Zip",
 
                     Action = async () =>
                     {
@@ -411,14 +415,14 @@ namespace IRaCIS.Core.Application.Service
                 //记录日志
                 downloadJobs.Add(new DownloadJob()
                 {
-                    Name = $"{visitItem.SubjectCode}_{visitItem.VisitNum}_{visitItem.VisitName}_Finished",
+                    Name = $"{visitItem.SubjectCode}_{visitItem.VisitNum}_{visitItem.VisitName.Trim()}_Finished",
                     Action = () =>
                 {
                     DownloadLogger.Write(
                         logFilePath: logFilePath,
                         subjectCode: visitItem.SubjectCode,
                         visitNum: visitItem.VisitNum,
-                        visitName: visitItem.VisitName,
+                        visitName: visitItem.VisitName.Trim(),
                         message: "Success");
 
                     return Task.CompletedTask;