修改IRC 3个bug

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

@@ -91,25 +91,6 @@ namespace IRaCIS.Core.Application.Contracts
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
 
-                #region 废弃
-                //if (uploadTimeSpan.Seconds == 0 && uploadTimeSpan.Minutes==0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                //else if (uploadTimeSpan.Minutes == 0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Seconds}秒";
-                //}
-                //else if (uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒";
-                //}
-                //else
-                //{
-                //    return $" {uploadTimeSpan.Hours} 小时 {uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒 {uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                #endregion
-
             }
         }
 

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -498,6 +498,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ArchiveFinishedTimeStr => ArchiveFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
 
+
         public string UploadIntervalStr
         {
             get
@@ -519,6 +520,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
+
         public string TimeInterval
         {
             get
@@ -527,6 +529,7 @@ namespace IRaCIS.Core.Application.Contracts
                 var uploadTimeSpan = ArchiveFinishedTime - UploadStartTime;
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
+
             }
         }
 

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Service
              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
 
-             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join(" | ", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " " + c.CreateTime.ToString("yyyy-mm-dd hh:mm:ss") + " :" + c.TalkContent))))
+             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join(" | ", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " " + c.CreateTime.ToString("yyyy-MM-dd hh:mm:ss") + " :" + c.TalkContent))))
                .ForMember(d => d.ModalityList, c => c.MapFrom(s =>
                 (s.NoneDicomStudyList.Select(t => t.Modality)
                 .Union(s.StudyList.Select(k => k.ModalityForEdit))).Distinct()))

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -624,6 +624,7 @@ namespace IRaCIS.Core.Application.Contracts
                              + Path.DirectorySeparatorChar.ToString()
                              + (_userInfo.IsEn_Us ? "TrialSiteSurveyReject_US" : "TrialSiteSurveyReject.html") ;
 
+
             using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
             {
                 var templateInfo = SourceReader.ReadToEnd();

IRaCIS.Core.Infrastructure/Extention/ExportExcelDateConverter.cs

@@ -65,12 +65,14 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
                 return obj;
 
             // 将对象序列化为 JSON 字符串
-            string json = JsonConvert.SerializeObject(obj);
+            string json = JsonConvert.SerializeObject(obj,new JsonSerializerSettings() { DateFormatString= "yyyy-MM-dd HH:mm:ss.fff" });
 
             // 将 JSON 字符串反序列化回对象
             var deserializedObj = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings
             {
-                Converters = { new ExportExcelDateConverter(clientTimeZone) }
+                Converters = { new ExportExcelDateConverter(clientTimeZone) },
+                DateFormatString = "yyyy-MM-dd HH:mm:ss.fff",
+                DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind
             });
 
             return deserializedObj!;