dir 增加字段

2025-08-08 14:29:29 +08:00
parent eafceeb5d1
commit 875a3668c1
10 changed files with 20167 additions and 76 deletions
@@ -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)
            };