IRC_NewDev
parent
4f5006560e
commit
5598385a5c
|
@ -760,7 +760,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
|
Value =t.Value ,
|
||||||
t.ValueCN,
|
t.ValueCN,
|
||||||
t.Description,
|
t.Description,
|
||||||
t.ShowOrder,
|
t.ShowOrder,
|
||||||
|
@ -2809,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
|
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).IgnoreQueryFilters().Select(t => new
|
||||||
{
|
{
|
||||||
QuestionName=_userInfo.IsEn_Us?t.QuestionEnName: t.QuestionName,
|
QuestionName=t.QuestionName,
|
||||||
t.QuestionEnName,
|
t.QuestionEnName,
|
||||||
QuestionId = t.Id,
|
QuestionId = t.Id,
|
||||||
t.DictionaryCode,
|
t.DictionaryCode,
|
||||||
|
@ -3118,7 +3118,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new
|
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new
|
||||||
{
|
{
|
||||||
QuestionName=_userInfo.IsEn_Us?t.QuestionEnName: t.QuestionName,
|
QuestionName=t.QuestionName,
|
||||||
t.QuestionEnName,
|
t.QuestionEnName,
|
||||||
QuestionId = t.Id,
|
QuestionId = t.Id,
|
||||||
t.DictionaryCode,
|
t.DictionaryCode,
|
||||||
|
@ -3136,7 +3136,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
TaskBlindName = u.VisitTask.TaskBlindName,
|
TaskBlindName = u.VisitTask.TaskBlindName,
|
||||||
QuestionId = u.ReadingQuestionTrialId,
|
QuestionId = u.ReadingQuestionTrialId,
|
||||||
QuestionName= _userInfo.IsEn_Us ? u.ReadingQuestionTrial.QuestionEnName : u.ReadingQuestionTrial.QuestionName,
|
QuestionName= u.ReadingQuestionTrial.QuestionName,
|
||||||
u.ReadingQuestionTrial.QuestionEnName,
|
u.ReadingQuestionTrial.QuestionEnName,
|
||||||
u.ReadingQuestionTrial.DictionaryCode,
|
u.ReadingQuestionTrial.DictionaryCode,
|
||||||
u.ReadingQuestionTrial.ShowOrder,
|
u.ReadingQuestionTrial.ShowOrder,
|
||||||
|
|
Loading…
Reference in New Issue