dir 增加字段

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -61,77 +61,89 @@ namespace IRaCIS.Core.Application.Helper
             foreach (var item in list.OrderBy(t => t.SeriesNumber).ThenBy(t => t.InstanceNumber))
             {
                 var dicomUid = DicomUID.Enumerate().FirstOrDefault(uid => uid.UID == item.TransferSytaxUID);
-                var ts = DicomTransferSyntax.Query(dicomUid);
 
-                var dataset = new DicomDataset(ts)
+                if (dicomUid != null)
                 {
-                    { DicomTag.PatientID, item.PatientId ?? string.Empty },
-                    { DicomTag.PatientName, item.PatientName ?? string.Empty },
-                    { DicomTag.PatientBirthDate, item.PatientBirthDate ?? string.Empty },
-                    { DicomTag.PatientSex, item.PatientSex ?? string.Empty },
+                    var ts = DicomTransferSyntax.Query(dicomUid);
 
-                    { DicomTag.StudyInstanceUID, item.StudyInstanceUid ?? string.Empty },
-                    { DicomTag.StudyID, item.StudyId ?? string.Empty },
-                    { DicomTag.StudyDate, item.DicomStudyDate ?? string.Empty },
-                    { DicomTag.StudyTime, item.DicomStudyTime ?? string.Empty },
-                    { DicomTag.AccessionNumber, item.AccessionNumber ?? string.Empty },
-                    { DicomTag.StudyDescription, item.StudyDescription ?? string.Empty },
+                    var dataset = new DicomDataset(ts)
+                    {
+                        { DicomTag.PatientID, item.PatientId ?? string.Empty },
+                        { DicomTag.PatientName, item.PatientName ?? string.Empty },
+                        { DicomTag.PatientBirthDate, item.PatientBirthDate ?? string.Empty },
+                        { DicomTag.PatientSex, item.PatientSex ?? string.Empty },
 
-                    { DicomTag.SeriesInstanceUID, item.SeriesInstanceUid ?? string.Empty },
-                    { DicomTag.Modality, item.Modality ?? string.Empty },
-                    { DicomTag.SeriesDate, item.DicomSeriesDate ?? string.Empty },
-                    { DicomTag.SeriesTime, item.DicomSeriesTime ?? string.Empty },
-                    { DicomTag.SeriesNumber, item.SeriesNumber.ToString() ?? string.Empty },
-                    { DicomTag.SeriesDescription, item.SeriesDescription ?? string.Empty },
+                        { DicomTag.StudyInstanceUID, item.StudyInstanceUid ?? string.Empty },
+                        { DicomTag.StudyID, item.StudyId ?? string.Empty },
+                        { DicomTag.StudyDate, item.DicomStudyDate ?? string.Empty },
+                        { DicomTag.StudyTime, item.DicomStudyTime ?? string.Empty },
+                        { DicomTag.AccessionNumber, item.AccessionNumber ?? string.Empty },
+                        { DicomTag.StudyDescription, item.StudyDescription ?? string.Empty },
 
-                    { DicomTag.SOPInstanceUID, item.SopInstanceUid ?? string.Empty },
-                    { DicomTag.SOPClassUID, item.SOPClassUID ?? string.Empty },
-                    { DicomTag.InstanceNumber, item.InstanceNumber.ToString() ?? string.Empty },
-                    { DicomTag.MediaStorageSOPClassUID, item.MediaStorageSOPClassUID ?? string.Empty },
-                    { DicomTag.MediaStorageSOPInstanceUID, item.MediaStorageSOPInstanceUID ?? string.Empty },
-                    { DicomTag.TransferSyntaxUID, item.TransferSytaxUID ?? string.Empty },
-                };
+                        { DicomTag.SeriesInstanceUID, item.SeriesInstanceUid ?? string.Empty },
+                        { DicomTag.Modality, item.Modality ?? string.Empty },
+                        { DicomTag.SeriesDate, item.DicomSeriesDate ?? string.Empty },
+                        { DicomTag.SeriesTime, item.DicomSeriesTime ?? string.Empty },
+                        { DicomTag.SeriesNumber, item.SeriesNumber.ToString() ?? string.Empty },
+                        { DicomTag.SeriesDescription, item.SeriesDescription ?? string.Empty },
 
-                var dicomFile = new DicomFile(dataset);
+                        { DicomTag.SOPInstanceUID, item.SopInstanceUid ?? string.Empty },
+                        { DicomTag.SOPClassUID, item.SOPClassUID ?? string.Empty },
+                        { DicomTag.InstanceNumber, item.InstanceNumber.ToString() ?? string.Empty },
+                        { DicomTag.MediaStorageSOPClassUID, item.MediaStorageSOPClassUID ?? string.Empty },
+                        { DicomTag.MediaStorageSOPInstanceUID, item.MediaStorageSOPInstanceUID ?? string.Empty },
+                        { DicomTag.TransferSyntaxUID, item.TransferSytaxUID ?? string.Empty },
+                    };
 
-                // 文件名递增格式：IM_00001, IM_00002, ...
-                string filename = $@"IMAGE/IM_{index:D5}";  // :D5 表示补足5位
+                    var dicomFile = new DicomFile(dataset);
 
-                mappings.Add($"{filename} => {item.InstanceId}");
+                    // 文件名递增格式：IM_00001, IM_00002, ...
+                    string filename = $@"IMAGE/IM_{index:D5}";  // :D5 表示补足5位
+
+                    mappings.Add($"{filename} => {item.InstanceId}");
+
+                    dic.Add(item.InstanceId.ToString(), filename);
+
+                    dicomDir.AddFile(dicomFile, filename);
+                }
 
-                dic.Add(item.InstanceId.ToString(), filename);
 
-                dicomDir.AddFile(dicomFile, filename);
             }
 
-            #region 写入临时路径
-            var tempFilePath = Path.GetTempFileName();
-
-            // 保存 DICOMDIR 到临时文件  不能直接写入到流种
-            await dicomDir.SaveAsync(tempFilePath);
-
-            using (var memoryStream = new MemoryStream(File.ReadAllBytes(tempFilePath)))
+            //有实际的文件
+            if (mappings.Count > 0)
             {
-                // 重置流位置
-                memoryStream.Position = 0;
+                #region 写入临时路径
+                var tempFilePath = Path.GetTempFileName();
 
-                await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", false);
+                // 保存 DICOMDIR 到临时文件  不能直接写入到流种
+                await dicomDir.SaveAsync(tempFilePath);
+
+                using (var memoryStream = new MemoryStream(File.ReadAllBytes(tempFilePath)))
+                {
+                    // 重置流位置
+                    memoryStream.Position = 0;
+
+                    await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", false);
+                }
+
+                //清理临时文件
+                File.Delete(tempFilePath);
+
+                #endregion
+
+                #region 映射上传
+
+                // 将映射写入内存流
+                var mappingText = string.Join(Environment.NewLine, mappings);
+                await using var mappingStream = new MemoryStream(Encoding.UTF8.GetBytes(mappingText));
+
+                await _oSSService.UploadToOSSAsync(mappingStream, ossFolder, $"Download_{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", false);
+
+                #endregion
             }
 
-            //清理临时文件
-            File.Delete(tempFilePath);
 
-            #endregion
-
-            #region 映射上传
-
-            // 将映射写入内存流
-            var mappingText = string.Join(Environment.NewLine, mappings);
-            await using var mappingStream = new MemoryStream(Encoding.UTF8.GetBytes(mappingText));
-
-            await _oSSService.UploadToOSSAsync(mappingStream, ossFolder, $"Download_{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", false);
-
-            #endregion
 
             return dic;
         }
@@ -142,6 +154,7 @@ namespace IRaCIS.Core.Application.Helper
         {
             var dataset = dicomFile.Dataset;
 
+
             var info = new StudyDIRInfo
             {
                 PatientId = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
@@ -166,8 +179,10 @@ namespace IRaCIS.Core.Application.Helper
                 SopInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty),
                 SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty),
                 InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
-                MediaStorageSOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty),
-                MediaStorageSOPInstanceUID = dataset.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty),
+
+                MediaStorageSOPClassUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty),
+                MediaStorageSOPInstanceUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty),
+
                 TransferSytaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty)
             };
 

IRaCIS.Core.Application/Service/Common/TrialImageDownloadService.cs

@@ -1,5 +1,8 @@
 using DocumentFormat.OpenXml.EMMA;
 using FellowOakDicom;
+using FellowOakDicom.Imaging;
+using FellowOakDicom.Imaging.Render;
+using FellowOakDicom.IO.Buffer;
 using IRaCIS.Core.Application.Helper;
 using MassTransit;
 using Microsoft.AspNetCore.Authorization;
@@ -244,17 +247,86 @@ namespace IRaCIS.Core.Application.Service
             [FromServices] IRepository<DicomStudy> _studyRepository,
             [FromServices] IRepository<DicomSeries> _seriesRepository)
         {
-            var list = await _instanceRepository.Where(t => t.TrialId == trialId)
+            var list = await _instanceRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == Guid.Parse("01000000-0a00-0242-bd20-08dcce543ded"))
                   .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);
 
                 var dicomFile = DicomFile.Open(stream);
 
+                // 获取 Pixel Data 标签
+                var pixelData = DicomPixelData.Create(dicomFile.Dataset);
+
+                //获取像素是否为封装形式
+                var syntax = dicomFile.Dataset.InternalTransferSyntax;
+
+                //对于封装像素的文件做转换
+                if (syntax.IsEncapsulated)
+                {
+                    // 创建一个新的片段序列
+                    var newFragments = new DicomOtherByteFragment(DicomTag.PixelData);
+                    // 获取每帧数据并封装为单独的片段
+                    for (int n = 0; n < pixelData.NumberOfFrames; n++)
+                    {
+                        var frameData = pixelData.GetFrame(n);
+                        newFragments.Fragments.Add(new MemoryByteBuffer(frameData.Data));
+                    }
+                    // 替换原有的片段序列
+                    dicomFile.Dataset.AddOrUpdate(newFragments);
+                }
+
+
+                #region 获取dir信息  维护数据库三个表数据
+
                 var dirInfo = DicomDIRHelper.ReadDicomDIRInfo(dicomFile);
 
+                await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id,
+                    u => new DicomInstance()
+                    {
+                        TransferSytaxUID = dirInfo.TransferSytaxUID,
+                        SOPClassUID = dirInfo.SOPClassUID,
+                        MediaStorageSOPClassUID = dirInfo.MediaStorageSOPClassUID,
+                        MediaStorageSOPInstanceUID = dirInfo.MediaStorageSOPInstanceUID
+                    }, false);
+
+                await _seriesRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.SeriesId,
+                  u => new DicomSeries()
+                  {
+                      DicomSeriesDate = dirInfo.DicomSeriesDate,
+                      DicomSeriesTime = dirInfo.DicomSeriesTime,
+                  }, false);
+
+                await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.StudyId,
+                  u => new DicomStudy()
+                  {
+                      DicomStudyDate = dirInfo.DicomStudyDate,
+                      DicomStudyTime = dirInfo.DicomStudyTime
+                  }, false);
+
+                #endregion
+
+
+
+                //保存到内存流
+                using var memoryStream = new MemoryStream();
+                dicomFile.Save(memoryStream);
+                memoryStream.Position = 0;
+
+                //获取原始目录 和文件名
+                var folder = item.Path.Substring(0, item.Path.LastIndexOf('/')).TrimStart('/');
+                var fileName = Path.GetFileName(item.Path);
+
+                await _oSSService.UploadToOSSAsync(memoryStream, folder, fileName, false);
+
+                dealCount++;
+
+                Console.WriteLine($"{DateTime.Now}已下载 {dealCount} / {totalCount} 个文件，完成 {(dealCount * 100.0 / totalCount):F2}%");
             }
 
             return ResponseOutput.Ok();

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
+using FellowOakDicom;
+using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
@@ -330,6 +331,7 @@ namespace IRaCIS.Core.Application.Contracts
         public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
 
 
+
     }
 
     public class AddOrUpdateSeriesDto
@@ -402,7 +404,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TransferSytaxUID { get; set; }
 
-        public string mediaStorageSOPInstanceUID { get; set; }
+        public string MediaStorageSOPInstanceUID { get; set; }
+
+        public bool IsEncapsulated => DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated;
+
     }
 
     public class CRCUploadTaskQuery