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 _studyRepository, [FromServices] IRepository _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++;