From 16a38b4e4df560bb2fa6a7097badfea41cd0af52 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 19 Apr 2022 11:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=83=8F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=BA=E5=8F=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DicomArchiveService.cs            | 8 +++++---
 IRaCIS.Core.Domain/Image/DicomInstance.cs                 | 2 +-
 IRaCIS.Core.Domain/Image/DicomSeries.cs                   | 2 +-
 IRaCIS.Core.Domain/Image/DicomStudy.cs                    | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
index 5524b2076..67e70e0de 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
@@ -223,7 +223,8 @@ namespace IRaCIS.Core.Application.Services
             {
                 Id = studyId,
                 StudyInstanceUid = studyInstanceUid,
-                StudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, DateTime.Now).TimeOfDay),//dataset.GetDateTime(DicomTag.StudyDate, DicomTag.StudyTime),
+                /* StudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, DateTime.Now).TimeOfDay),*///dataset.GetDateTime(DicomTag.StudyDate, DicomTag.StudyTime),
+                StudyTime = dataset.GetSingleValue<DateTime?>(DicomTag.StudyDate)?.Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, TimeSpan.Zero)),
                 Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                 Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
                 InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
@@ -356,7 +357,8 @@ namespace IRaCIS.Core.Application.Services
                     StudyInstanceUid = dicomStudy.StudyInstanceUid,
                     SeriesInstanceUid = seriesInstanceUid,
                     SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
-                    SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay), // dataset.GetDateTime(DicomTag.SeriesDate, DicomTag.SeriesTime),
+                    //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
+                    SeriesTime =   dataset.GetSingleValue<DateTime?>(DicomTag.SeriesDate)?.Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, TimeSpan.Zero)),// dataset.GetDateTime(DicomTag.SeriesDate, DicomTag.SeriesTime),
                     Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                     Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
                     SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
@@ -411,7 +413,7 @@ namespace IRaCIS.Core.Application.Services
                 SeriesInstanceUid = dicomSeries.SeriesInstanceUid,
                 SopInstanceUid = sopInstanceUid,
                 InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
-                InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, DateTime.Now).TimeOfDay),
+                InstanceTime = dataset.GetSingleValue<DateTime?>(DicomTag.ContentDate)?.Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, TimeSpan.Zero)),
                 //dataset.GetSingleValueOrDefault(DicomTag.ContentDate,DateTime.Now);//, DicomTag.ContentTime)
                 CPIStatus = false,
                 ImageRows = dataset.GetSingleValueOrDefault(DicomTag.Rows, 0),
diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs
index 10c865c25..4f301ede2 100644
--- a/IRaCIS.Core.Domain/Image/DicomInstance.cs
+++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs
@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models
         public string SeriesInstanceUid { get; set; }
         public string SopInstanceUid { get; set; }
         public int InstanceNumber { get; set; }
-        public DateTime InstanceTime { get; set; }
+        public DateTime? InstanceTime { get; set; }
         public bool CPIStatus { get; set; }
         public int ImageRows { get; set; }
         public int ImageColumns { get; set; }
diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs
index 97df3cf33..d348cd70f 100644
--- a/IRaCIS.Core.Domain/Image/DicomSeries.cs
+++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs
@@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
         public string StudyInstanceUid { get; set; }
         public string SeriesInstanceUid { get; set; }
         public int SeriesNumber { get; set; }
-        public DateTime SeriesTime { get; set; }
+        public DateTime? SeriesTime { get; set; }
         public string Modality { get; set; }
         public string Description { get; set; }
         public int InstanceCount { get; set; }
diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs
index aeb943890..ea598cfff 100644
--- a/IRaCIS.Core.Domain/Image/DicomStudy.cs
+++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs
@@ -34,7 +34,7 @@ namespace IRaCIS.Core.Domain.Models
         public int Status { get; set; } = 1;
 
         public string StudyInstanceUid { get; set; } = string.Empty;
-        public DateTime StudyTime { get; set; }
+        public DateTime? StudyTime { get; set; }
         public string Modalities { get; set; } = string.Empty;
 
         public string Description { get; set; } = string.Empty;