From d9d807e3d1f79e7a9e79f4c45db36ad7a5cf7660 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 7 Mar 2025 10:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dicom=20=20=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=BA=8F=E5=88=97=E8=AE=BE=E7=BD=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20=20=E6=A3=80=E6=9F=A5=E8=A2=AB=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                    | 14 +++++---------
 .../Service/Visit/SubjectVisitService.cs           |  4 +++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index fdaaa3040..f0383b59c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -14217,6 +14217,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.PublishLogAddOrEdit">
             <summary> PublishLogAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SysFileTypeAddOrEdit.ShowOrder">
+            <summary>
+            显示顺序    
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigView">
             <summary> TrialEmailNoticeConfigView  列表视图模型 </summary>
         </member>
@@ -15399,15 +15404,6 @@
         <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileView">
             <summary> NoneDicomStudyFileView  列表视图模型 </summary>
         </member>
-        <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery">
-            <summary>NoneDicomStudyFileQuery  列表查询参数模型</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery.Path">
-            <summary> Path</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileQuery.FileName">
-            <summary> FileName</summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyFileAddOrEdit">
             <summary> NoneDicomStudyFileAddOrEdit  列表查询参数模型</summary>
         </member>
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index c415c2c06..8e28ae4f4 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -231,8 +231,9 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId)
+            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).IgnoreQueryFilters()
             .Where(t => isImageFilter ? ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
+            .WhereIf(isReading == 1 || isQCFinished, s=> s.IsDeleted == false)
                 .Select(k => new VisitStudyDTO()
                 {
                     InstanceCount = k.InstanceCount,
@@ -241,6 +242,7 @@ namespace IRaCIS.Core.Application.Services
                     StudyCode = k.StudyCode,
                     StudyId = k.Id
                 }).ToListAsync();
+
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
             var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()