From 266a0c5dd5d7df2c605943fb6100c96416c373d5 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 11 Jul 2025 10:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=97=E8=AF=95?=
 =?UTF-8?q?=E8=80=85=E9=9A=8F=E6=9C=BAbug=E4=BF=AE=E6=94=B9=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs  |  6 ++++++
 .../Service/ImageAndDoc/_MapConfig.cs                | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
index 59a74aaf3..3124f5d84 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
@@ -107,8 +107,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public string Modalities { get; set; }
 
         public string Description { get; set; }
+
         public int SeriesCount { get; set; }
         public int InstanceCount { get; set; }
+
+        public int ReadingSeriesCount { get; set; }
+
+        public int ReadingInstanceCount { get; set; }
     }
 
     public class NoneDicomStudyBasicInfo
@@ -128,6 +133,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public string Description { get; set; } = string.Empty;
 
 
+        public int ReadingFileCount { get; set; }
 
     }
 }
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
index ab7aa15c1..a0173b944 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
@@ -130,16 +130,20 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.CriterionModalitys, u => u.MapFrom(s => s.TrialReadingCriterion.CriterionModalitys))
                 .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code));
 
-            CreateMap<DicomStudy, DicomStudyBasicInfo>();
-            CreateMap<NoneDicomStudy, NoneDicomStudyBasicInfo>();
+            CreateMap<DicomStudy, DicomStudyBasicInfo>()
+                  .ForMember(d => d.ReadingSeriesCount, u => u.MapFrom(s => s.SeriesList.Where(t => t.IsReading).Count()))
+                  .ForMember(d => d.ReadingInstanceCount, u => u.MapFrom(s => s.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading).Count()));
+
+            CreateMap<NoneDicomStudy, NoneDicomStudyBasicInfo>()
+                 .ForMember(d => d.ReadingFileCount, u => u.MapFrom(s => s.NoneDicomFileList.Where(t => t.IsReading).Count()));
+
             CreateMap<VisitTask, SubjectCRCImageUploadedDto>()
                 .ForMember(d => d.VisitTaskId, u => u.MapFrom(s => s.Id))
                 .ForMember(d => d.IsImageFilter, u => u.MapFrom(s => s.TrialReadingCriterion.IsImageFilter))
                  .ForMember(d => d.CriterionModalitys, u => u.MapFrom(s => s.TrialReadingCriterion.CriterionModalitys))
                 .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code))
                 .ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.StudyList))
-                .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.NoneDicomStudyList))
-                ;
+                .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.SourceSubjectVisit.NoneDicomStudyList.Where(t => t.IsReading)));
 
             CreateMap<TrialImageDownload, TrialImageDownloadView>()
                 .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName))