From 8fedcdaf00de9069004c3f5865d364b32dba16ab Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 16 Jul 2024 17:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=20=E5=8C=BA=E5=88=86=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9D=A5=E8=87=AAPacs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml        | 6 ++++--
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs         | 7 ++++++-
 .../Service/ImageAndDoc/StudyService.cs                    | 4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4e7dc89e5..3eebc5573 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -875,21 +875,23 @@
             <param name="trialReadingCriterionId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.RequestPackageAndAnonymizImage(System.Guid,System.Guid,System.Boolean)">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.RequestPackageAndAnonymizImage(System.Guid,System.Guid,System.Boolean,System.Boolean)">
             <summary>
             打包和匿名化影像 默认是匿名化打包，也可以不匿名化打包
             </summary>
             <param name="trialId"></param>
             <param name="subjectVisitId"></param>
+            <param name="isDicom"></param>
             <param name="isAnonymize"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.PackageAndAnonymizImage(System.Guid,System.Guid,System.Boolean)">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.PackageAndAnonymizImage(System.Guid,System.Guid,System.Boolean,System.Boolean)">
             <summary>
             后台任务调用，前端忽略该接口
             </summary>
             <param name="trialId"></param>
             <param name="subjectVisitId"></param>
+            <param name="isDicom"></param>
             <param name="isAnonymize"></param>
             <returns></returns>
         </member>
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 8226693c0..6be7f1de5 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -44,6 +44,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string RecordPath { get; set; } = string.Empty;
         public bool IsDicom { get; set; }
+
+
+        
     }
 
     public class UnionStudyMonitorModel : UnionStudyBaseModel
@@ -124,7 +127,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid Id { get; set; }
 
-
+        public bool IsFromPACS { get; set; }
 
         public int? Count { get; set; }
 
@@ -164,6 +167,8 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsSuccess { get; set; }
 
         public string? StudyCode { get; set; }
+
+        public bool? IsFromPACS { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 50c2882a5..96051495f 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -372,6 +372,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         VisitNum = t.SubjectVisit.VisitNum,
 
                         IsDicom = true,
+                        IsFromPACS=t.IsFromPACS,
 
                         SubjectCode = t.Subject.Code,
 
@@ -455,7 +456,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var unionQuery = dicomStudyQuery.Union(nodeDicomStudyQuery)
                 .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
                 .WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
-                .WhereIf(studyQuery.TrialSiteId != null, t => t.TrialSiteId == studyQuery.TrialSiteId);
+                .WhereIf(studyQuery.TrialSiteId != null, t => t.TrialSiteId == studyQuery.TrialSiteId)
+                 .WhereIf(studyQuery.IsFromPACS != null, t => t.IsFromPACS == studyQuery.IsFromPACS);
 
             return await unionQuery.ToPagedListAsync(studyQuery.PageIndex, studyQuery.PageSize, studyQuery.SortField, studyQuery.Asc);
         }