diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index f203f26e4..c357a9a35 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -87,7 +87,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string ParentCode { get; set; } - public List DictionaryList { get; set; } + public List DictionaryIds { get; set; } } public class SetAssessTypeInDto { @@ -97,7 +97,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string ParentCode { get; set; } - public List DictionaryIds { get; set; } + public List DictionaryList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index b9bed1db1..22fd0e86c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -472,15 +472,15 @@ namespace IRaCIS.Core.Application.Service.RC { await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary() + + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary() { CriterionId = inDto.CriterionId, - DictionaryId = x.DictionaryId, - IsBaseLineUse = x.IsBaseLineUse, - IsFollowVisitUse = x.IsFollowVisitUse, + DictionaryId = x, IsSystemCriterion = true, ParentCode = inDto.ParentCode })); + await _readingCriterionDictionaryRepository.SaveChangesAsync(); @@ -488,7 +488,7 @@ namespace IRaCIS.Core.Application.Service.RC } /// - /// 设置标准字典(系统用) + /// 设置评估类型 /// /// /// @@ -497,10 +497,12 @@ namespace IRaCIS.Core.Application.Service.RC { await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary() + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary() { CriterionId = inDto.CriterionId, - DictionaryId = x, + DictionaryId = x.DictionaryId, + IsBaseLineUse = x.IsBaseLineUse, + IsFollowVisitUse = x.IsFollowVisitUse, IsSystemCriterion = true, ParentCode = inDto.ParentCode }));