diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 8406f3574..14457fbe2 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2218,6 +2218,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 是否显示在Dicom阅片中 @@ -2318,6 +2328,21 @@ TrialId + + + 首次添加任务ID + + + + + 窗宽WW + + + + + 窗位WL + + InstanceId @@ -2488,6 +2513,21 @@ 是Dicom阅片 + + + 首次添加任务ID + + + + + 窗宽WW + + + + + 窗位WL + + MeasureData @@ -2548,6 +2588,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 字典code @@ -3888,6 +3938,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 自定义单位 @@ -3956,6 +4016,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 字典code @@ -4284,6 +4354,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 数据来源 @@ -4324,6 +4404,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + Id @@ -4644,6 +4734,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 数据来源 @@ -4949,6 +5049,16 @@ 限制编辑 + + + 最大答案长度 + + + + + 文件类型 + + 自定义单位 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 72055aea4..14ef3fbed 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -26,6 +26,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 限制编辑 /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } public Guid QuestionId { get; set; } public Guid TableQuestionId { get; set; } @@ -1109,6 +1119,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 字典code /// diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 14547dba2..d87998f20 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -319,6 +319,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 自定义单位 /// @@ -416,6 +426,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 限制编辑 /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } public Guid? Id { get; set; } public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; @@ -937,6 +957,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 数据来源 /// @@ -985,6 +1015,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// Id /// @@ -1459,6 +1499,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 数据来源 /// @@ -1791,6 +1841,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 自定义单位 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index f58311ba6..92cd26fe7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -213,6 +213,8 @@ namespace IRaCIS.Application.Services AnswerGroup = y.ReadingQuestionTrial.AnswerGroup, QuestionType = y.ReadingQuestionTrial.QuestionType, LimitEdit= y.ReadingQuestionTrial.LimitEdit, + MaxAnswerLength=y.ReadingQuestionTrial.MaxAnswerLength, + FileType=y.ReadingQuestionTrial.FileType, QuestionGenre = y.ReadingQuestionTrial.QuestionGenre, DictionaryCode = y.ReadingQuestionTrial.DictionaryCode, GlobalReadingShowType=y.ReadingQuestionTrial.GlobalReadingShowType, @@ -284,6 +286,8 @@ namespace IRaCIS.Application.Services QuestionName = lr.question.QuestionName, QuestionType = lr.question.QuestionType, LimitEdit=lr.question.LimitEdit, + MaxAnswerLength=lr.question.MaxAnswerLength, + FileType=lr.question.FileType, QuestionGenre = lr.question.QuestionGenre, DictionaryCode = lr.question.DictionaryCode, GlobalReadingShowType = lr.question.GlobalReadingShowType, diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs index 0ed829101..0fbf3f73f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs @@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate QuestionGenre = x.QuestionGenre, DictionaryCode = x.DictionaryCode, LimitEdit= x.LimitEdit, + MaxAnswerLength=x.MaxAnswerLength, + FileType=x.FileType, TypeValue = x.TypeValue, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us), ShowOrder = x.ShowOrder, @@ -169,6 +171,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate QuestionGenre = x.QuestionGenre, GroupEnName=x.GroupEnName, LimitEdit = x.LimitEdit, + MaxAnswerLength=x.MaxAnswerLength, + FileType=x.FileType, DictionaryCode = x.DictionaryCode, Type = x.Type, QuestionType = x.QuestionType, @@ -238,6 +242,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IsShowInDicom = question.IsShowInDicom, DataSource = x.DataSource, LimitEdit = x.LimitEdit, + MaxAnswerLength=x.MaxAnswerLength, + FileType=x.FileType, LesionType = question.LesionType, TableQuestionType = x.TableQuestionType, DictionaryCode = x.DictionaryCode, diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index 5c49a4dc8..e8eb0be8b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -182,6 +182,16 @@ namespace IRaCIS.Core.Domain.Models /// public DataSources DataSource { get; set; } = DataSources.ManualEntry; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + [JsonIgnore] [ForeignKey("ReadingQuestionCriterionSystemId")] public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 729de9cdb..943211ed6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -163,6 +163,16 @@ namespace IRaCIS.Core.Domain.Models /// public int? MaxQuestionCount { get; set; } + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + /// /// 是否显示在Dicom阅片中 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 914389f79..ba44b85dd 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -163,6 +163,16 @@ namespace IRaCIS.Core.Domain.Models /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + [ForeignKey("DependParentId")] [JsonIgnore] public ReadingTableQuestionSystem DependParentQuestion { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 4efe88217..df02d648c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -185,6 +185,16 @@ namespace IRaCIS.Core.Domain.Models /// public DataSources DataSource { get; set; } = DataSources.ManualEntry; + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } + [JsonIgnore] [ForeignKey("DependParentId")] public ReadingTableQuestionTrial DependParentQuestion { get; set; }