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

修改下载代码
continuous-integration/drone/push Build is running Details

Test_IRC_Net8
hang 2026-06-01 15:37:01 +08:00
parent 41efcbfdf1
commit 45db942f66
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
View File

@ -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;