From f902e443030786b2244104b44975bf83004877d2 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 28 Aug 2024 13:33:55 +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 --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 4ed2f2334..86968dcb2 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1379,7 +1379,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var trialQuestionIdList = list.Select(t => t.TrialQCQuestionConfigureId); - var trialQuestionNameList = await _dbContext.TrialQCQuestionConfigure.Where(x => x.TrialId == firstEntity.TrialId).Select(t => new { t.QuestionName, TrialQCQuestionConfigureId = t.Id, t.ShowOrder }).ToListAsync(); + var trialQuestionNameList = await _dbContext.TrialQCQuestionConfigure.Where(x => x.TrialId == firstEntity.TrialId).Select(t => new { t.QuestionName, TrialQCQuestionConfigureId = t.Id, t.ShowOrder }).ToListAsync(); var beforeAnswerList = await _dbContext.TrialQCQuestionAnswer.Where(x => x.SubjectVisitId == firstEntity.SubjectVisitId && x.CurrentQCEnum == firstEntity.CurrentQCEnum && x.QCProcessEnum == firstEntity.QCProcessEnum) .Select(u => new { u.TrialQCQuestionConfigureId, u.Answer }).ToListAsync(); @@ -1402,6 +1402,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common QcQuestionAnswerList = answerList.Join(trialQuestionNameList, t => t.TrialQCQuestionConfigureId, u => u.TrialQCQuestionConfigureId, (t, u) => new { t.Answer, + u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList(), @@ -2808,7 +2809,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //获取问题名称 组合成数组 var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).IgnoreQueryFilters().Select(t => new { - t.QuestionName, + QuestionName=_userInfo.IsEn_Us?t.QuestionEnName: t.QuestionName, t.QuestionEnName, QuestionId = t.Id, t.DictionaryCode,