From 71e867156fe022affc3f19bd4acd7ba32e9560f4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 26 Nov 2025 13:45:47 +0800
Subject: [PATCH] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8-11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs  |  5 +++--
 .../Service/ImageAndDoc/DownloadAndUploadService.cs | 13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 8cf9ea30f..f1e0f3060 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -505,8 +505,9 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class IRTaskUploadedDicomStudyQuery
     {
-        [NotDefault]
-        public Guid VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
+
+        public Guid? SubjectVisitId { get; set; }
     }
 
     public class IRUploadTaskDicomStudyDto : DicomStudyBasicInfo
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 97fcac6a4..5c9ab031e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -548,7 +548,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var @uploadLock = _distributedLockProvider.CreateLock($"UploadTaskDicom");
 
-            var visiTaskId = incommand.VisitTaskId ?? Guid.Empty; 
+            var visiTaskId = incommand.VisitTaskId ?? Guid.Empty;
 
             using (await @uploadLock.AcquireAsync())
             {
@@ -1027,7 +1027,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
 
 
-            
+
         }
 
 
@@ -1701,11 +1701,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpPost]
         public async Task<IResponseOutput> GetTaskUploadedDicomStudyList(IRTaskUploadedDicomStudyQuery inQuery)
         {
-            var info = await _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId)
+            var info = await _visitTaskRepository
+                 .WhereIf(inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)//正常后处理
                  .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
 
-            var query = _taskStudyRepository.Where(t => t.VisitTaskId == inQuery.VisitTaskId)
-                .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
+            var query = _taskStudyRepository
+                .WhereIf(inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)//正常后处理
+                .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId)//靶段标注处理的影像
+                .WhereIf( info.IsImageFilter && inQuery.VisitTaskId != null, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") )
                 .Select(t => new
                 {
                     StudyId = t.Id,