From 39d9cefda90fcf7e4b41493e3b154fee5cf20199 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 19 Jan 2024 16:32:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=B8=8A=E4=BC=A0=E7=9B=91=E6=8E=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs    | 11 ++++++++++-
 .../Service/ImageAndDoc/StudyService.cs               |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 75f6d7d81..870ad98b4 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -173,7 +173,16 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string[]? VisitPlanArray { get; set; }
 
-    }
+        public Guid? VisitTaskId { get; set; }
+
+		public bool? IsDicom { get; set; }
+
+		public string? Uploader { get; set; }
+
+		public bool? IsSuccess { get; set; }
+
+        public string? StudyCode { get; set; }
+	}
 
 
     public class PreArchiveDicomStudyCommand
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 54880b1ed..f4b2440f4 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -457,6 +457,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                  .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
                  .WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
                  .WhereIf(studyQuery.SiteId != null, t => t.SiteId == studyQuery.SiteId)
+				 .WhereIf(studyQuery.IsDicom != null, t => t.IsDicom == studyQuery.IsDicom )
+				 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.Uploader), t => t.Uploader.UserName.Contains(studyQuery.Uploader))
+				 .WhereIf(studyQuery.IsSuccess != null, t => t.IsSuccess == studyQuery.IsSuccess)
+                 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.StudyCode), t => t.StudyCode.Contains(studyQuery.StudyCode))
                  .Select(t => new UnionStudyMonitorModel()
                  {
                      TrialId = t.TrialId,