dicom dir处理返回处理后的路径

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -49,8 +49,9 @@ namespace IRaCIS.Core.Application.Helper
     public static class DicomDIRHelper
     {
 
-        public static async Task GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, string ossFolder, IOSSService _oSSService)
+        public static async Task<Dictionary<string, string>> GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, string ossFolder, IOSSService _oSSService)
         {
+            var dic = new Dictionary<string, string>();
             var mappings = new List<string>();
             int index = 1;
 
@@ -98,6 +99,8 @@ namespace IRaCIS.Core.Application.Helper
 
                 mappings.Add($"{filename} => {item.InstanceId}");
 
+                dic.Add(item.InstanceId.ToString(), filename);
+
                 dicomDir.AddFile(dicomFile, filename);
             }
 
@@ -130,6 +133,45 @@ namespace IRaCIS.Core.Application.Helper
 
             #endregion
 
+            return dic;
+        }
+
+
+
+        public static StudyDIRInfo ReadDicomDIRInfo(DicomFile dicomFile)
+        {
+            var dataset = dicomFile.Dataset;
+
+            var info = new StudyDIRInfo
+            {
+                PatientId = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
+                PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
+                PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+                PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
+
+                StudyInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty),
+                StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
+                DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty),
+                DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty),
+                AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
+                StudyDescription = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
+
+                SeriesInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty),
+                Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
+                DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty),
+                DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty),
+                SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
+                SeriesDescription = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
+
+                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),
+                TransferSytaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty)
+            };
+
+            return info;
         }
     }
 }