From 24228428fa24bc925df1fc56e99ecc80ce8fc8b5 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 19 Nov 2025 13:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9Esubject=20=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E7=9A=84=E9=9D=9Edicom=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 177b9ad38..c86426865 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -987,6 +987,10 @@ namespace IRaCIS.Core.Application.Contracts
         public int? DicomStudyCount { get; set; }
 
         public int? MarkDicomStudyCount { get; set; }
+
+        public int? NoneDicomStudyCount { get; set; }
+
+        public int? MarkNoneDicomStudyCount { get; set; }
     }
 
     public class SubjectVisitMarkStudyDto
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 442b0ecb6..1969f5562 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -2208,6 +2208,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                       DicomStudyCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).SelectMany(t => t.StudyList).Count(),
                       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(),
                   }).ToList();
 
             return ResponseOutput.Ok(list);