diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index fecc69269..3ee512a6a 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 DictionaryIds { get; set; } + public List DictionaryInfoList { get; set; } + } + + public class SystemGlobalInfo + { + /// + /// DictionaryId + /// + public Guid DictionaryId { get; set; } + + + /// + /// IsBaseLineUse + /// + public bool IsBaseLineUse { get; set; } = false; + + /// + /// IsBaseUse + /// + 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 1ab07abf4..c950f22a1 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()