From 0f859c0251499576fb48485473c4da84e6e5d2c1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 8 Aug 2025 16:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Helper/DicomDIRHelper.cs            | 2 ++
 .../Service/Common/TrialImageDownloadService.cs             | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/DicomDIRHelper.cs b/IRaCIS.Core.Application/Helper/DicomDIRHelper.cs
index 865bd96b4..babba603e 100644
--- a/IRaCIS.Core.Application/Helper/DicomDIRHelper.cs
+++ b/IRaCIS.Core.Application/Helper/DicomDIRHelper.cs
@@ -105,6 +105,8 @@ namespace IRaCIS.Core.Application.Helper
                     dic.Add(item.InstanceId.ToString(), filename);
 
                     dicomDir.AddFile(dicomFile, filename);
+
+                    index++;
                 }
 
 
diff --git a/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs b/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
index b6a6d6b5e..4e2088406 100644
--- a/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
+++ b/IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs
@@ -247,14 +247,13 @@ namespace IRaCIS.Core.Application.Service
             [FromServices] IRepository<DicomStudy> _studyRepository,
             [FromServices] IRepository<DicomSeries> _seriesRepository)
         {
-            var list = await _instanceRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == Guid.Parse("01000000-0a00-0242-bd20-08dcce543ded"))
+            var list = await _instanceRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == Guid.Parse("01000000-0a00-0242-bd20-08dcce543ded" ) && t.DicomStudy.ModalityForEdit == "IVUS")
                   .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.Path }).ToListAsync();
 
             int totalCount = list.Count;
             int dealCount = 0;
             foreach (var item in list)
             {
-                dealCount++;
 
                 var stream = await _oSSService.GetStreamFromOSSAsync(item.Path);
 
@@ -289,6 +288,7 @@ namespace IRaCIS.Core.Application.Service
                 await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id,
                     u => new DicomInstance()
                     {
+                        IsEncapsulated= syntax.IsEncapsulated,
                         TransferSytaxUID = dirInfo.TransferSytaxUID,
                         SOPClassUID = dirInfo.SOPClassUID,
                         MediaStorageSOPClassUID = dirInfo.MediaStorageSOPClassUID,
@@ -322,6 +322,8 @@ namespace IRaCIS.Core.Application.Service
                 var folder = item.Path.Substring(0, item.Path.LastIndexOf('/')).TrimStart('/');
                 var fileName = Path.GetFileName(item.Path);
 
+                dicomFile.Save($"download_{Guid.NewGuid()}");
+
                 await _oSSService.UploadToOSSAsync(memoryStream, folder, fileName, false);
 
                 dealCount++;