From f365c19d4a4c681f7b489733829f51ccf7aee5c7 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 14 Jul 2022 16:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs    |  1 +
 .../Service/TrialSiteUser/TrialConfigService.cs    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 491dcf9a0..43a529be1 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -526,6 +526,7 @@ namespace IRaCIS.Core.Application.Contracts
 		/// </summary>
 		public string QuestionName { get; set; }
 
+        public string PageName { get; set; }
 
         /// <summary>
         /// 答案分组
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 13fe003e8..400e97320 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -83,14 +83,14 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<TrialJudgeQuestion>> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
+        public async Task<(List<TrialJudgeQuestion>,object)> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
         {
             var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
             if (trialCriterion == null)
             {
                 throw new BusinessValidationFailedException("请先确认一个项目标准。");
             }
-            return await _readingQuestionTrialRepository
+            var judgeQuestionList= await _readingQuestionTrialRepository
                 .WhereIf(trialCriterion.FormType==FormType.SinglePage,x=>x.ReadingCriterionPageId==null)
                  .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null)
                 .Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.IsJudgeQuestion && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId== trialCriterion.Id)
@@ -100,9 +100,19 @@ namespace IRaCIS.Core.Application
                   AnswerGroup = x.AnswerGroup,
                   JudgeType = x.JudgeType,
                   QuestionId = x.Id,
+                  PageName=x.ReadingCriterionPage.PageName,
                   QuestionName = x.QuestionName,
                   ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId
               }).ToListAsync();
+
+            var signTime = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.ReadingInfoSignTime).FirstOrDefaultAsync();
+
+            return (judgeQuestionList, new
+            {
+
+                IsSign= signTime!=null,
+
+            });
         }
 
         /// <summary>