From 8ec35d90fb80023bfb6aa28f7f69c685361eafb7 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Sep 2024 13:49:39 +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/ReadingImageTaskViewModel.cs | 6 ++++++ .../ReadingImageTask/ReadingGlobalTaskService.cs | 2 ++ .../ReadingImageTask/ReadingJudgeTaskService.cs | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 681b950f4..8a275b60c 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1621,6 +1621,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string FileType { get; set; } = string.Empty; + public ValueUnit? Unit { get; set; } + /// /// 字典code /// @@ -2084,6 +2086,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public dynamic Answer { get; set; } + public string Type { get; set; } = string.Empty; + + public ValueUnit? Unit { get; set; } + public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 13c40cd9d..1076abeb8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -301,6 +301,7 @@ namespace IRaCIS.Core.Application.Service LimitEdit = y.LimitEdit, MaxAnswerLength = y.MaxAnswerLength, FileType = y.FileType, + Unit=y.Unit, QuestionGenre = y.QuestionGenre, ShowOrder = y.ShowOrder, DictionaryCode = y.DictionaryCode, @@ -390,6 +391,7 @@ namespace IRaCIS.Core.Application.Service DictionaryCode = lr.question.DictionaryCode, GlobalReadingShowType = lr.question.GlobalReadingShowType, Type = lr.question.Type, + Unit = y.Unit, GlobalAnswerType = GlobalAnswerType.Question, AnswerGroup = lr.question.AnswerGroup, AnswerCombination = lr.question.AnswerCombination, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index f7a8105d2..e5b3639b3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -161,6 +161,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new GlobalVisitJudgeQuestion() { Answer = x.Answer, + Type= x.ReadingQuestionTrial.Type, + Unit= x.ReadingQuestionTrial.Unit, ShowOrder = x.ReadingQuestionTrial.ShowOrder, VisitTaskId = x.VisitTaskId, QuestionId = x.ReadingQuestionTrial.Id, @@ -174,6 +176,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new GlobalVisitJudgeQuestion() { Answer = x.Answer, + Type = x.ReadingQuestionTrial.Type, + Unit = x.ReadingQuestionTrial.Unit, ShowOrder = x.ReadingQuestionTrial.ShowOrder, VisitTaskId = x.VisitTaskId, QuestionId = x.ReadingQuestionTrial.Id, @@ -204,6 +208,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -223,6 +229,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -254,6 +262,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.ReadingQuestionTrial.Type, + Unit = x.ReadingQuestionTrial.Unit, QuestionId = x.ReadingQuestionTrial.Id, QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, @@ -302,6 +312,8 @@ namespace IRaCIS.Core.Application.Service { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId!.Value, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -342,6 +354,8 @@ namespace IRaCIS.Core.Application.Service { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre,