diff --git a/IRaCIS.Core.API/Controllers/StudyController.cs b/IRaCIS.Core.API/Controllers/StudyController.cs index 4c58095b1..a6f1ff696 100644 --- a/IRaCIS.Core.API/Controllers/StudyController.cs +++ b/IRaCIS.Core.API/Controllers/StudyController.cs @@ -197,6 +197,7 @@ namespace IRaCIS.Api.Controllers StudyId = archivedStudyIds[0], UploadStartTime = startTime, UploadFinishedTime = DateTime.Now, + TotalMillisecondsInterval = (DateTime.Now- startTime).TotalMilliseconds, FileSize = (decimal)HttpContext.Request.ContentLength, FileCount = archiveResult.ReceivedFileCount, IsDicom = true, diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index d307ac8c0..30ddfe927 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -57,28 +57,32 @@ namespace IRaCIS.Core.Application.Contracts public string UploadFinishedTimeStr => UploadFinishedTime.ToString("yyyy-MM-dd HH:mm:ss.fff"); + public double TotalMillisecondsInterval { get; set; } + + public string TimeInterval { get { - var tSpan = UploadFinishedTime - UploadStartTime; + var uploadTimeSpan = UploadFinishedTime - UploadStartTime; - if (tSpan.Seconds == 0 && tSpan.Minutes==0 && tSpan.Hours == 0) + + if (uploadTimeSpan.Seconds == 0 && uploadTimeSpan.Minutes==0 && uploadTimeSpan.Hours == 0) { - return $"{tSpan.Milliseconds}毫秒"; + return $"{uploadTimeSpan.Milliseconds}毫秒"; } - else if ( tSpan.Minutes == 0 && tSpan.Hours == 0) + else if (uploadTimeSpan.Minutes == 0 && uploadTimeSpan.Hours == 0) { - return $"{tSpan.Seconds}秒"; + return $"{uploadTimeSpan.Seconds}秒"; } - else if ( tSpan.Hours == 0) + else if (uploadTimeSpan.Hours == 0) { - return $"{tSpan.Minutes} 分钟 {tSpan.Seconds} 秒"; + return $"{uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒"; } else { - return $" {tSpan.Hours} 小时 {tSpan.Minutes} 分钟 {tSpan.Seconds} 秒"; + return $" {uploadTimeSpan.Hours} 小时 {uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒 {uploadTimeSpan.Milliseconds}毫秒"; } } } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs index 121ccfabe..5bc986705 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs @@ -164,6 +164,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc FileSize = t.FileSize, UploadFinishedTime = t.UploadFinishedTime, UploadStartTime = t.UploadStartTime, + + TotalMillisecondsInterval = t.TotalMillisecondsInterval, + IsDicomReUpload = t.IsDicomReUpload, StudyId = t.Id, IsDicom = t.IsDicom, @@ -174,7 +177,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc }); - //.ProjectTo(_mapper.ConfigurationProvider); @@ -204,6 +206,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc FileSize = t.FileSize, UploadFinishedTime = t.UploadFinishedTime, UploadStartTime = t.UploadStartTime, + + TotalMillisecondsInterval = t.TotalMillisecondsInterval, + IsDicomReUpload = t.IsDicomReUpload, StudyId = t.Id, IsDicom = t.IsDicom, diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 56bd54c07..099ed2e39 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -303,6 +303,7 @@ namespace IRaCIS.Core.Application.Contracts FileCount = formCollection.Files.Count, FileSize = formCollection.Files.Sum(t => t.Length), IsDicom = false, IsDicomReUpload = false, StudyId = noneDicomStudyId, UploadStartTime = startTime, UploadFinishedTime = DateTime.Now, IP = _userInfo.IP, + TotalMillisecondsInterval = (DateTime.Now - startTime).TotalMilliseconds, TrialId = sv.TrialId, SiteId = sv.SiteId, SubjectId = sv.SubjectId, diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index 61756a95c..6fef85409 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -28,6 +28,10 @@ namespace IRaCIS.Core.Domain.Models public Guid StudyId { get; set; } + + + public double TotalMillisecondsInterval { get; set; } + public DateTime UploadStartTime { get; set; }