From 47755bc2aa2cee2196d3458f38721cd9b1db3b12 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 27 Feb 2025 13:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/NoneDicomStudyService.cs           | 7 +++++--
 IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs  | 7 +++++++
 IRaCIS.Core.Domain/Trial/Trial.cs                          | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
index 1e76770b7..f82a373c9 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpGet]
-        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(
+        public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetNoneDicomStudyList(
             [FromQuery, NotDefault] Guid subjectVisitId,
             [FromQuery] Guid? nonedicomStudyId,
             [FromQuery] bool isFilterZip,
@@ -54,7 +54,10 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-            return await noneDicomStudyQueryable.ToListAsync();
+            var list = await noneDicomStudyQueryable.ToListAsync();
+
+            var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
+            return ResponseOutput.Ok(list, config) ;
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 7b21a2efb..7020f74d1 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -161,6 +161,13 @@ namespace IRaCIS.Core.Application.Contracts
         [Comment("阅片任务产生之前 采集影像")]
         public CollectImagesType CollectImagesEnum { get; set; }
 
+        public List<StudyName> StudyNameList { get; set; } 
+
+
+        public List<string> ImageFormatList { get; set; }
+
+        public bool IsShowStudyName { get; set; } = false;
+
     }
 
 
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 1312b3857..f0c0f4eaf 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// 图像格式
     /// </summary>
     [StringLength(2000)]
-    public List<string> ImageFormatList { get; set; } = new List<string>();
+    public List<string> ImageFormatList { get; set; } = new List<string>() {"jpg","jpeg","png","bmp","pdf","zip" };
     #endregion
 
     #region 邮件配置