From 3d428af85b8cf6fd05f43ca5b0326a19521eb121 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 20 Sep 2024 16:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImageAndDoc/DTO/UnionStudyViewDodel.cs       | 16 ++++++++++++++++
 .../Service/ImageAndDoc/StudyService.cs          |  2 ++
 .../Service/Visit/DTO/PatientViewModel.cs        | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index a7bc9e3f9..9c8953122 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -166,6 +166,11 @@ namespace IRaCIS.Core.Application.Contracts
         public string? StudyCode { get; set; }
 
         public bool? IsFromPACS { get; set; }
+
+
+        public DateTime? UploadStartTime { get; set; }
+
+        public DateTime? UploadFinishedTime { get; set; }
     }
 
 
@@ -571,6 +576,17 @@ namespace IRaCIS.Core.Application.Contracts
 
         public UserTypeEnum UserTypeEnum { get; set; }
 
+
+        public string UploadIntervalStr
+        {
+            get
+            {
+                var uploadTimeSpan = DownloadEndTime - DownloadStartTime;
+
+                return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
+            }
+        }
+
     }
 
     public class TrialIamgeDownQuery : PageInput
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 5f5193d92..e9cde73d0 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -479,6 +479,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Uploader), t => t.CreateUser.UserName.Contains(inQuery.Uploader))
                  .WhereIf(inQuery.IsSuccess != null, t => t.IsSuccess == inQuery.IsSuccess)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.StudyCode), t => t.StudyCode.Contains(inQuery.StudyCode))
+                 .WhereIf(inQuery.UploadStartTime != null, t => t.UploadStartTime >= inQuery.UploadStartTime)
+                 .WhereIf(inQuery.UploadFinishedTime != null, t => t.UploadFinishedTime <= inQuery.UploadFinishedTime)
                  .Select(t => new UnionStudyMonitorModel()
                  {
                      TrialId = t.TrialId,
diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
index 61cc7611c..f7477c78a 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
@@ -1004,6 +1004,16 @@ namespace IRaCIS.Application.Contracts
 
         public string TrialSiteAliasName { get; set; }
 
+        public string UploadIntervalStr
+        {
+            get
+            {
+                var uploadTimeSpan = EndTime - StartTime;
+
+                return $" {uploadTimeSpan.Hours}:{uploadTimeSpan.Minutes}:{uploadTimeSpan.Seconds}.{uploadTimeSpan.Milliseconds}";
+            }
+        }
+
     }
     public class VisitPatientStudyView : PatientStudySelectDto
     {