归档增加字段-三个影像层级表

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

@@ -324,13 +324,26 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string BodyPartExamined { get; set; } = string.Empty;
 
-        public string DicomStudyDate { get; set; }
+        public string DicomStudyDate { get; set; } = string.Empty;
 
-        public string DicomStudyTime { get; set; }
+        public string DicomStudyTime { get; set; } = string.Empty;
 
         public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
 
+        #region 模态支持增加字段
 
+        public string Manufacturer { get; set; } = string.Empty;
+
+        public string ManufacturerModelName { get; set; } = string.Empty;
+
+        public string DeviceSerialNumber { get; set; } = string.Empty;
+        public string DeviceUID { get; set; } = string.Empty;
+
+        public string SoftwareVersions { get; set; } = string.Empty;
+
+        public string PatientWeight { get; set; } = string.Empty;
+
+        #endregion
 
     }
 
@@ -358,14 +371,22 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ImageResizePath { get; set; } = string.Empty;
 
-        public string DicomSeriesDate { get; set; }
+        public string DicomSeriesDate { get; set; } = string.Empty;
 
-        public string DicomSeriesTime { get; set; }
+        public string DicomSeriesTime { get; set; } = string.Empty;
 
 
         public List<AddInstanceDto> InstanceList { get; set; }
 
         public Guid? VisitTaskId { get; set; }
+
+        #region 模态增加
+
+        public string RadiopharmaceuticalInformationSequence { get; set; } = string.Empty;
+
+        public string AcquisitionDate { get; set; } = string.Empty;
+
+        #endregion
     }
 
 
@@ -398,15 +419,46 @@ namespace IRaCIS.Core.Application.Contracts
 
         public long FileSize { get; set; }
 
-        public string SOPClassUID { get; set; }
+        public string SOPClassUID { get; set; } = string.Empty;
 
-        public string MediaStorageSOPClassUID { get; set; }
+        public string MediaStorageSOPClassUID { get; set; } = string.Empty;
 
-        public string TransferSytaxUID { get; set; }
+        public string TransferSytaxUID { get; set; } = string.Empty;
 
-        public string MediaStorageSOPInstanceUID { get; set; }
+        public string MediaStorageSOPInstanceUID { get; set; } = string.Empty;
 
-        public bool IsEncapsulated => DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated;
+        public bool IsEncapsulated => !string.IsNullOrEmpty(TransferSytaxUID) ? DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated : false;
+
+        #region 模态支持增加字段
+
+        public string PhotometricInterpretation { get; set; } = string.Empty;
+
+        public int BitsAllocated { get; set; }
+
+        public string PixelRepresentation { get; set; } = string.Empty;
+
+        public string RescaleIntercept { get; set; } = string.Empty;
+
+        public string RescaleSlope { get; set; } = string.Empty;
+
+        public string ImagePositionPatient { get; set; } = string.Empty;
+        public string ImageOrientationPatient { get; set; } = string.Empty;
+
+        //可能大
+        public string SequenceOfUltrasoundRegions { get; set; } = string.Empty;
+
+        public string FrameTime { get; set; } = string.Empty;
+
+        public string CorrectedImage { get; set; } = string.Empty;
+
+        public string Units { get; set; } = string.Empty;
+        public string DecayCorrection { get; set; } = string.Empty;
+
+        public string EncapsulatedDocument { get; set; } = string.Empty;
+
+
+
+        #endregion
 
     }
 
@@ -536,11 +588,11 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TaskBlindName { get; set; }
 
-        
+
         public Guid VisitId { get; set; }
 
         public List<DownloadDicomStudyDto> StudyList { get; set; }
-        public List<DownloadNoneDicomStudyDto> NoneDicomStudyList { get; set; } 
+        public List<DownloadNoneDicomStudyDto> NoneDicomStudyList { get; set; }
     }
 
     public class DownloadDicomStudyDto
@@ -551,14 +603,14 @@ namespace IRaCIS.Core.Application.Contracts
         public string StudyInstanceUid { get; set; }
         public string StudyDIRPath { get; set; }
 
-        public List<DownloadDicomSeriesDto> SeriesList { get; set; } 
+        public List<DownloadDicomSeriesDto> SeriesList { get; set; }
     }
 
     public class DownloadDicomSeriesDto
     {
         public string Modality { get; set; }
 
-        public List<DownloadDicomInstanceDto> InstanceList { get; set; } 
+        public List<DownloadDicomInstanceDto> InstanceList { get; set; }
     }
 
     public class DownloadDicomInstanceDto
@@ -735,7 +787,7 @@ namespace IRaCIS.Core.Application.Contracts
        ? $"{TotalReadingImageSize.Value / 1024d / 1024d:F3} MB"
        : "0.000 MB";
 
-        public string ImageTypeStr => $"{(IsHaveDicom ? "DICOM" : "")}{(IsHaveNoneDicom&&IsHaveDicom?" , ":"")}{(IsHaveNoneDicom ? "Non-DICOM" : "")}";
+        public string ImageTypeStr => $"{(IsHaveDicom ? "DICOM" : "")}{(IsHaveNoneDicom && IsHaveDicom ? " , " : "")}{(IsHaveNoneDicom ? "Non-DICOM" : "")}";
 
         public bool IsHaveDicom { get; set; }