From 55d2ec2dd7375df57690d78862d2d29986610a73 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 3 Jan 2023 10:38:01 +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 | 56 ++++++++++++++++++- .../ReadingQuestionService.cs | 9 +++ .../ReadingQuestionSystem.cs | 11 ++++ .../ReadingQuestionTrial.cs | 10 ++++ .../ReadingTableQuestionSystem.cs | 5 ++ .../ReadingTableQuestionTrial.cs | 5 ++ .../Common/ReadingCommon.cs | 11 ++++ 7 files changed, 106 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 99585941f..552b9e096 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -364,6 +364,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionMark? QuestionMark { get; set; } + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + + public List ParentTriggerValueList { get; set; } public List RelevanceValueList { get; set; } @@ -432,6 +439,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionMark? QuestionMark { get; set; } + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + + } @@ -877,7 +891,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 数据来源 /// public DataSources? DataSource { get; set; } = DataSources.ManualEntry; - + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + public List ParentTriggerValueList { get; set; } public List RelevanceValueList { get; set; } public List CalculateQuestionList { get; set; } @@ -1043,6 +1067,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 序号标记 /// public string OrderMark { get; set; } = string.Empty; + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; } public class GetQuestionCalculateRelationInDto @@ -1464,6 +1498,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 序号标记 /// public string OrderMark { get; set; } = string.Empty; + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; } @@ -1652,6 +1696,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + public List ParentTriggerValueList { get; set; } public List RelevanceValueList { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 51186ab88..7b0d78bbf 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -113,6 +113,13 @@ namespace IRaCIS.Application.Services ), true); } + + + public async Task Test() + { + return await _readingQuestionTrialRepository.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)).FirstAsync(); + } + /// /// 获取问题 /// @@ -140,6 +147,8 @@ namespace IRaCIS.Application.Services x.ReadingQuestionId, x.QuestionName }).ToListAsync(); + + result.ForEach(x => { x.TableQuestions = tablequestion.Where(y => x.QuestionId == y.ReadingQuestionId).Select(y => new CalculateQuestion() diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index 59e508fbd..fb2eb737f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -161,6 +161,17 @@ namespace IRaCIS.Core.Domain.Models public ValueUnit? Unit { get; set; } + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + + /// /// 数据来源 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index d9359d559..e520fe454 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -220,6 +220,16 @@ namespace IRaCIS.Core.Domain.Models /// public DataSources DataSource { get; set; } = DataSources.ManualEntry; + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + /// /// 分页标准 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 10c970c32..46da2e783 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -148,6 +148,11 @@ namespace IRaCIS.Core.Domain.Models /// public ValueUnit? Unit { get; set; } + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + /// /// 数据来源 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 130842ccd..135f03fb6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -175,6 +175,11 @@ namespace IRaCIS.Core.Domain.Models /// public string CalculateQuestions { get; set; } = "[]"; + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + /// /// 数据来源 /// diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs index ce44e85a8..85f0ce663 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs @@ -42,6 +42,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common }; } + /// + /// 获取语言名称 + /// + /// + /// + /// + /// + public static string LanguageName(this string Name, string englishName, bool isEN) + { + return isEN ? englishName : Name; + } /// /// 阅片问题类型