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

---
 .../ImageAndDoc/DownloadAndUploadService.cs     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 2ae8d7279..8f1f2eee5 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -898,7 +898,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             //靶段标注上传，查看访视级别，上传绑定访视级别
             if (inQuery.IsImageSegmentLabel == true)
             {
-                var list = _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId && t.SubjectVisitId == inQuery.SubjectVisitId)
+                var list = _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId)
+                    .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId)
                     //.WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
                     .Select(u => new TaskNoneDicomStudyDTO()
                     {
@@ -1248,7 +1249,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0)
                   .Select(item => new SubjectVisitMarkStudyDto
                   {
-                      SourceSubjectVisitId=item.SourceSubjectVisitId,
+                      SourceSubjectVisitId = item.SourceSubjectVisitId,
                       VisitTaskId = item.VisitTaskId,
                       SubjectId = item.SubjectId,
                       SubjectCode = item.SubjectCode,
@@ -1542,10 +1543,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         from leftVisitTask in cc.DefaultIfEmpty()
                         select new ImageDownloadDto()
                         {
-                            TrialId=sv.TrialId,
-                            SubjectId=sv.SubjectId,
-                            TrialSiteCode=sv.TrialSite.TrialSiteCode,
-                            VisitId=sv.Id,
+                            TrialId = sv.TrialId,
+                            SubjectId = sv.SubjectId,
+                            TrialSiteCode = sv.TrialSite.TrialSiteCode,
+                            VisitId = sv.Id,
 
                             SubjectCode = inQuery.SubjectCode,
                             VisitName = sv.VisitName,
@@ -2209,7 +2210,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                   {
                       TrialId = t.TrialId,
                       SubjectId = t.Id,
-                      SubjectCode=t.Code,
+                      SubjectCode = t.Code,
                       IsUrgent = t.IsUrgent,
                       VisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(),
                       MarkVisitCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(t => t.TaskStudyList.Any()),
@@ -2218,7 +2219,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                       MarkDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.TaskStudyList).Count(),
 
                       NoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Count(),
-                      MarkNoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Where(t=>t.ImageLabelNoneDicomFileList.Any()).Count(),
+                      MarkNoneDicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.NoneDicomStudyList).Where(t => t.ImageLabelNoneDicomFileList.Any()).Count(),
                   }).ToPagedListAsync(inQuery);
 
             return ResponseOutput.Ok(list);