From 4624b0f12e1606e4681cb40aab9ee938c7b1971e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 10 Jul 2025 16:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=87=E6=BB=A4=E4=B8=8D=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs        | 7 ++++---
 IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs  | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index e6fe710d3..dedb2ba2b 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -1008,11 +1008,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 u.StudyTime,
                                 u.StudyCode,
 
-                                SeriesList = u.SeriesList.Select(z => new
+                                SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new
                                 {
                                     z.Modality,
 
-                                    InstancePathList = z.DicomInstanceList.Select(k => new
+                                    InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new
                                     {
                                         k.Path,
                                         k.FileSize
@@ -1023,13 +1023,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                             NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
                              .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
+                             .Where(t=>t.IsReading)
                             .Select(nd => new
                             {
                                 nd.Modality,
                                 nd.StudyCode,
                                 nd.ImageDate,
 
-                                FileList = nd.NoneDicomFileList.Select(file => new
+                                FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new
                                 {
                                     file.FileName,
                                     file.Path,
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
index ab7aa15c1..ba2e1b19e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
@@ -138,8 +138,7 @@ 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))
                 .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))