From 9903b2413bdcafe9c2c64921f3654c1d25ea8ee2 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 8 Nov 2022 11:54:29 +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

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 22 ++++++++++++++++++-
 .../ReadingCriterionService.cs                |  8 ++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index fecc6926..3ee512a6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -198,7 +198,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public bool IsMustGlobalReading { get; set; }
 
-		public List<Guid> DictionaryIds { get; set; }
+		public List<SystemGlobalInfo> DictionaryInfoList { get; set; }
+	}
+
+	public class SystemGlobalInfo
+	{
+		/// <summary>
+		/// DictionaryId
+		/// </summary>
+		public Guid DictionaryId { get; set; }
+
+
+		/// <summary>
+		/// IsBaseLineUse
+		/// </summary>
+		public bool IsBaseLineUse { get; set; } = false;
+
+		/// <summary>
+		/// IsBaseUse
+		/// </summary>
+		public bool IsFollowVisitUse { get; set; } = false;
+
 	}
 
 	public class SetSystemOncologyInfoInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
index 1ab07abf..c950f22a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
@@ -82,12 +82,14 @@ namespace IRaCIS.Core.Application.Service.RC
 
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.SystemCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.GlobalAssess);
 
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryInfoList.Select(x => new ReadingCriterionDictionary
             {
                 CriterionId = inDto.SystemCriterionId,
-                DictionaryId = x,
+                DictionaryId = x.DictionaryId,
                 IsSystemCriterion = true,
-                ParentCode = ReadingCommon.CriterionDictionary.GlobalAssess
+                ParentCode = ReadingCommon.CriterionDictionary.GlobalAssess,
+                IsBaseLineUse=x.IsBaseLineUse,
+                IsFollowVisitUse=x.IsFollowVisitUse,
             }));
 
             await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.SystemCriterionId, x => new ReadingQuestionCriterionSystem()