From f50b5819c0c5627a77f945f131363f9b213ebfad Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 19 Jun 2024 18:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/Interface/INoneDicomStudyService.cs         | 2 +-
 .../Service/QC/NoneDicomStudyService.cs                    | 4 ++--
 IRaCIS.Core.Application/Service/QC/_MapConfig.cs           | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs
index a90a92c94..b5b881fb0 100644
--- a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs
@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId);
         Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId);
         Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);
-        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null);
+        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null, bool isFilterZip=false);
         Task<List<NoneDicomStudyFileView>> GetVisitNoneDicomStudyFileList(Guid subjectVisitId);
         //Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId);
 
diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
index e6a40c3bf..005ca14d0 100644
--- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
@@ -37,12 +37,12 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpGet]
-        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, Guid? nonedicomStudyId)
+        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, [FromQuery] Guid? nonedicomStudyId, [FromQuery] bool isFilterZip)
         {
 
             var noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
 
-                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken });
+                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip });
 
             return await noneDicomStudyQueryable.ToListAsync();
         }
diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index dd1f9ad12..7bb30bb77 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -253,9 +253,10 @@ namespace IRaCIS.Core.Application.Service
             #endregion
 
 
-          
 
-			string token = string.Empty;
+            bool isFilterZip = false;
+
+            string token = string.Empty;
             //一致性核查
             CreateMap<CheckDBModel, CheckViewModel>();
 
@@ -560,7 +561,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<NoneDicomStudy, NoneDicomStudyView>()
                 //.ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count))
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip))))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip? s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip)): s.NoneDicomFileList))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));