From 7ac3ef9c2c0b7a62bafef5821ecaf0e6f04da005 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 21 Oct 2022 09:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       | 21 ++++++++++++++++++-
 .../TrialSiteUser/TrialConfigService.cs       |  6 ++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 22b0ddb56..a95f55003 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -793,7 +793,7 @@ namespace IRaCIS.Core.Application.Contracts
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
 
-        public List<Guid> GlobalAssessTypeIds { get; set; }
+        public List<SetGlobalReading> GlobalAssessList { get; set; }
 
 
         ///// <summary>
@@ -802,6 +802,25 @@ namespace IRaCIS.Core.Application.Contracts
         //public bool IsGlobalReading { get; set; }
     }
 
+
+    public class SetGlobalReading
+    {
+        /// <summary>
+        /// DictionaryId
+        /// </summary>
+        public Guid DictionaryId { get; set; }
+
+        /// <summary>
+        /// IsBaseLineUse
+        /// </summary>
+        public bool IsBaseLineUse { get; set; } 
+
+        /// <summary>
+        /// IsBaseUse
+        /// </summary>
+        public bool IsFollowVisitUse { get; set; }
+    }
+
     public class GetOncologySetInDto
     {
         public Guid TrialReadingCriterionId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index b7dde28a9..8d1b78138 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -193,10 +193,12 @@ namespace IRaCIS.Core.Application
 
             //});
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == ReadingCommon.GlobalAssess);
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.GlobalAssessTypeIds.Select(x => new ReadingCriterionDictionary
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.GlobalAssessList.Select(x => new ReadingCriterionDictionary
             {
                 CriterionId = inDto.TrialReadingCriterionId,
-                DictionaryId = x,
+                DictionaryId = x.DictionaryId,
+                IsBaseLineUse=x.IsBaseLineUse,
+                IsFollowVisitUse=x.IsFollowVisitUse,
                 IsSystemCriterion = false,
                 ParentCode = ReadingCommon.GlobalAssess
             }));