From 642e6d46729cd961674bce7eeb5131be3c1a2aba Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Oct 2022 13:33:37 +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     | 13 +++++++++++++
 .../Service/TrialSiteUser/TrialConfigService.cs     |  4 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 60dfa3869..95813d1d5 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -334,11 +334,24 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public Guid TrialId { get; set; }
 
+        public bool IsSystemCriterion
+        {
+            get
+            {
+                return this.ReadingQuestionCriterionSystemId != null;
+            }
+        }
+
         /// <summary>
         /// 阅片平台
         /// </summary>
         public int ImagePlatform { get; set; } = 1;
 
+        /// <summary>
+        /// 系统标准ID
+        /// </summary>
+        public Guid? ReadingQuestionCriterionSystemId { get; set; }
+
         /// <summary>
         /// 阅片模式
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index b988a521c..c2f867d0b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -299,15 +299,13 @@ namespace IRaCIS.Core.Application
                         TrialReadingCriterionId = inDto.TrialReadingCriterionId,
                     });
                 }
-
+                result.IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
             };
 
             result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
             &&x.ReadingCriterionPageId==null)
               .ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
-            result.IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
-
             return result;
         }