From 302658d467163af432b9ed19b4596d7668cd69f6 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 11 Jun 2025 13:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=93=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs   |  3 +++
 .../Service/ImageAndDoc/DownloadAndUploadService.cs  | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 81af79674..e325616c4 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -602,6 +602,9 @@ namespace IRaCIS.Core.Application.Contracts
         ? $"{TotalImageSize.Value / 1024d / 1024d:F3} MB"
         : "0.000 MB";
 
+        public bool IsHaveDicom { get; set; }
+
+        public bool IsHaveNoneDicom { get; set; }
 
         #region 废弃，为了字段排序
         //public int TotalStudyCount => DicomStudyCount + NoneDicomStudyCount;
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 5557ae305..2c4f63afa 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -1179,6 +1179,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                   .Select(t => new TrialVisitImageStatView()
                   {
                       TrialId = t.TrialId,
+                      SubjectVisitId = t.Id,
                       SubjectCode = t.Subject.Code,
                       TrialSiteCode = t.TrialSite.TrialSiteCode,
                       TrialSiteId = t.TrialSiteId,
@@ -1187,6 +1188,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                       EarliestScanDate = t.EarliestScanDate,
                       LatestScanDate = t.LatestScanDate,
 
+                      IsHaveDicom = t.StudyList.Any(),
+
+                      IsHaveNoneDicom = t.NoneDicomStudyList.Any(),
+
 
                       TotalStudyCount = t.StudyList.Count() + t.NoneDicomStudyList.Count(),
 
@@ -1206,7 +1211,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                   });
 
 
-            var pagelist = await query.ToPagedListAsync(inQuery);
+            var pagelist = await query.Where(t => t.TotalImageCount > 0).ToPagedListAsync(inQuery);
 
             return ResponseOutput.Ok(pagelist);
         }
@@ -1225,8 +1230,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                   {
                       SubjectId = g.Key,
                       VisitCount = g.Count(),
-                      ImageSize = g.Sum(t => t.NoneDicomStudyList.SelectMany(t => t.NoneDicomFileList).Sum(t => t.FileSize)
-                       + g.Sum(t => t.StudyList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize)))
+                      ImageSize = g.SelectMany(t => t.NoneDicomStudyList).SelectMany(t => t.NoneDicomFileList).Sum(t => t.FileSize)
+
+                       + g.SelectMany(t => t.StudyList).SelectMany(t => t.InstanceList).Sum(t => t.FileSize)
                   })
                   .ToList();