From f35f3bf70f94e1e4d2275c8a887c85c92bc9a48b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 21 Nov 2022 16:18:56 +0800
Subject: [PATCH] x

---
 .../Service/QC/Interface/IQCListService.cs               | 2 +-
 IRaCIS.Core.Application/Service/QC/QCListService.cs      | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/Interface/IQCListService.cs b/IRaCIS.Core.Application/Service/QC/Interface/IQCListService.cs
index 21829357..8c792494 100644
--- a/IRaCIS.Core.Application/Service/QC/Interface/IQCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/Interface/IQCListService.cs
@@ -25,7 +25,7 @@ namespace IRaCIS.Core.Application.Image.QA
         Task<List<QCQuestionAnswerItemDto>> GetQCQuestionAnswerList(Guid subjectVisitId, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType);
       
         Task<List<SubjectVisitSelectItem>> GetSubjectVisitSelectList(Guid subjectId);
-        Task<List<QAStudyInfoDTO>> GetSubjectVisitUploadedStudyList(Guid subjectVisitId);
+        Task<(List<QAStudyInfoDTO>, object)> GetSubjectVisitUploadedStudyList(Guid subjectVisitId);
         Task<UploadViewInitDto> GetUploadInitInfo(Guid subjectVisitId);
         Task<TrialVisitQADTO> GetVisitQCInfo(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType);
         Task<QAStudySeriesInfo> GetVisitQCStudyAndSeriesList(Guid subjectVisitId);
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index 843fad93..83bf387d 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -1453,9 +1453,14 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpGet("{subjectVisitId:guid}")]
-        public async Task<List<QAStudyInfoDTO>> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
+        public async Task<(List<QAStudyInfoDTO>,object)> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
         {
-            return await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            var list= await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+
+            var config = await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t=>t.Trial).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
+
+            return (list, config);
         }