From 8bd46c6c1893256be536f01b006dbd446074b00d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 27 Aug 2026 15:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9D=9D=E6=AE=B5=E6=A0=87=E6=B3=A8=EF=BC=8CIR?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20=E6=98=AF=E5=90=A6=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index dfb204f31..0b71bd459 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -1002,7 +1002,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
 
-                var list = _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId && t.SubjectVisit.CheckState == CheckStateEnum.CVPassed && t.IsReading)
+                var list = _noneDicomStudyReposiotry.Where(t => t.IsReading && t.NoneDicomFileList.Any(c => c.IsReading))
+                    .Where(t => t.SubjectId == subjectId && t.SubjectVisit.CheckState == CheckStateEnum.CVPassed)
                     .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId)
                     //.WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
                     .Select(u => new TaskNoneDicomStudyDTO()
@@ -1036,7 +1037,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var noneDicomStudyIdList = list.Select(t => t.Id).ToList();
 
 
-                var noneDicomStudyList = _noneDicomStudyFileReposiotry.Where(t => t.ImageLabelNoneDicomStudyId != null)
+                var noneDicomStudyList = _noneDicomStudyFileReposiotry.Where(t => t.IsReading)
+                    .Where(t => t.ImageLabelNoneDicomStudyId != null)
                     .Where(t => noneDicomStudyIdList.Contains((Guid)t.ImageLabelNoneDicomStudyId!))
                       .Select(u => new NoneDicomFileInfo
                       {
@@ -1063,7 +1065,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                                      && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.DoctorUserId == doctorUserId && t.TaskState == TaskState.Effect)
                            //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
                            .WhereIf(info.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)
-                            join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId).WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
+                            join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == subjectId).Where(t => t.IsReading).WhereIf(info.IsImageFilter, t => ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
                             on u.SourceSubjectVisitId equals ns.SubjectVisitId
 
                             select new TaskNoneDicomStudyDTO()