From 99d681bde5d1482bf7985372ae776a0f24689b57 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 12 Jan 2023 14:16:36 +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 | 38 ++++++++++++++----- .../ReadingQuestionSystem.cs | 5 +++ .../ReadingTableQuestionSystem.cs | 5 +++ 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 5878d9df6..169f122d1 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -289,11 +289,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string CalculateQuestions { get; set; } = "[]"; - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - /// /// 数值类型 /// @@ -304,6 +299,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// /// 自定义单位 /// @@ -393,6 +393,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 单位 /// public ValueUnit? Unit { get; set; } + + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public Guid? Id { get; set; } public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; @@ -888,6 +893,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// /// 自定义单位 /// @@ -946,6 +952,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// /// Id /// @@ -1412,6 +1423,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueOfType? ValueType { get; set; } + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// /// 数据来源 /// @@ -1422,6 +1438,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// /// 全局阅片显示类型 /// @@ -1699,6 +1716,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LesionType? LesionType { get; set; } + /// /// 问题类型 /// @@ -1730,6 +1748,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// /// 自定义单位 /// @@ -1745,11 +1768,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string CalculateQuestions { get; set; } = "[]"; - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - /// /// 问题英文名称 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index fb2eb737f..5c49a4dc8 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -171,6 +171,11 @@ namespace IRaCIS.Core.Domain.Models /// public string GroupEnName { get; set; } = string.Empty; + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// /// 数据来源 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 46da2e783..914389f79 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -158,6 +158,11 @@ namespace IRaCIS.Core.Domain.Models /// public DataSources DataSource { get; set; } = DataSources.ManualEntry; + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + [ForeignKey("DependParentId")] [JsonIgnore] public ReadingTableQuestionSystem DependParentQuestion { get; set; }