diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index b2e94eea7..071c9b024 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -2499,7 +2499,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 是否显示 /// - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } /// /// 最大问题数 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 7b4e1e8ba..5e2a335d7 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Remark { get; set; } public Guid? RelevanceId { get; set; } public string RelevanceValue { get; set; } = string.Empty; - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } public int? MaxRowCount { get; set; } public string DataTableName { get; set; } = string.Empty; public string DataTableColumn { get; set; } = string.Empty; @@ -577,7 +577,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Remark { get; set; } public Guid? RelevanceId { get; set; } public string RelevanceValue { get; set; } = string.Empty; - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } public int? MaxRowCount { get; set; } public string DataTableName { get; set; } = string.Empty; public string DataTableColumn { get; set; } = string.Empty; @@ -1707,7 +1707,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string RelevanceValue { get; set; } = string.Empty; [Comment("是否显示")] - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } [Comment("最大问题数")] public int? MaxRowCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs index 1571c096a..795d8764b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs @@ -284,6 +284,7 @@ namespace IRaCIS.Core.Application.Service RelevanceValue = x.RelevanceValue, ImageCount = 0, ParentId = item.Id, + ShowQuestion=x.ShowQuestion, DataTableColumn = x.DataTableColumn, LesionType = item.LesionType, QuestionName = x.QuestionName, @@ -298,6 +299,7 @@ namespace IRaCIS.Core.Application.Service Id = x.Id, DictionaryCode = x.DictionaryCode, Type = x.Type, + ShowQuestion = x.ShowQuestion, TableQuestionType = x.TableQuestionType, DependParentId = x.DependParentId, IsDepend = x.IsDepend, diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 53e992ccb..4b71e92bd 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -87,7 +87,7 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity public string RelevanceValue { get; set; } = string.Empty; [Comment("是否显示")] - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } [Comment("最大问题数")] public int? MaxRowCount { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 49c5a763d..0cc03697c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -90,7 +90,7 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity public string RelevanceValue { get; set; } = string.Empty; - public int ShowQuestion { get; set; } + public ShowQuestion ShowQuestion { get; set; } public int? MaxRowCount { get; set; } [Comment("图片数量")]