diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 83c88f70e..a89a813d4 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -111,6 +111,8 @@ namespace IRaCIS.Application.Contracts public string ValueCN { get; set; } = string.Empty; public string Value { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public int ShowOrder { get; set; } public Guid? ParentId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 7188c9f54..053fe1c0b 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -158,6 +158,11 @@ namespace IRaCIS.Application.Services [HttpDelete("{id:guid}")] public async Task DeleteDictionary(Guid id) { + if (await _readingCriterionDictionaryRepository.AnyAsync(x => x.DictionaryId == id)) + { + return ResponseOutput.NotOk("当前字典在标准中被引用,不允许删除!"); + } + if (await _dicRepository.AnyAsync(t => t.ParentId == id)) { return ResponseOutput.NotOk("有子项数据,不允许直接删除!"); @@ -314,6 +319,7 @@ namespace IRaCIS.Application.Services { ChildGroup = x.Dictionary.ChildGroup, Code = x.Dictionary.Code, + Description=x.Dictionary.Description, DataTypeEnum = x.Dictionary.DataTypeEnum, ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum, ShowOrder = x.Dictionary.ShowOrder, diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index 79b3108e8..6e339098b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -202,6 +202,13 @@ namespace IRaCIS.Core.Application.ViewModel public Guid OriginalId { get; set; } } + + public class SynchronizeSystemOrganInDto + { + + } + + public class SynchronizeSystemOrganToTrialInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 7b03369a6..6e5d70773 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -950,6 +950,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueOfType? ValueType { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } + /// /// 数据来源 /// @@ -1021,10 +1026,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string RelevanceValue { get; set; } = string.Empty; - /// - /// 备注 - /// - public string Remark { get; set; } /// /// 系统标准Id @@ -1570,6 +1571,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public LesionType? LesionType { get; set; } + + /// /// 问题类型 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs index c902d36a8..3257cf065 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs @@ -369,6 +369,10 @@ namespace IRaCIS.Core.Application.Service #endregion + //public async Task SynchronizeSystemOrgan() + //{ + + //} ///