处理字典
parent
8d80545229
commit
24e03d5d3d
|
@ -1123,6 +1123,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
|
||||||
public List<GlobalQuestionInfo> BeforeQuestionList { get; set; }
|
public List<GlobalQuestionInfo> BeforeQuestionList { get; set; }
|
||||||
|
|
||||||
public List<GlobalQuestionInfo> AgreeOrNot { get; set; }
|
public List<GlobalQuestionInfo> AgreeOrNot { get; set; }
|
||||||
|
@ -1226,6 +1227,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 是否是裁判问题
|
/// 是否是裁判问题
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsJudgeQuestion { get; set; } = true;
|
public bool IsJudgeQuestion { get; set; } = true;
|
||||||
|
|
||||||
|
public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetReadingImgOutDto
|
public class GetReadingImgOutDto
|
||||||
|
|
|
@ -228,7 +228,7 @@ namespace IRaCIS.Application.Services
|
||||||
VisitNum = x.SourceSubjectVisit.VisitNum,
|
VisitNum = x.SourceSubjectVisit.VisitNum,
|
||||||
IsBaseLine=x.SourceSubjectVisit.IsBaseLine,
|
IsBaseLine=x.SourceSubjectVisit.IsBaseLine,
|
||||||
VisitId = x.SourceSubjectVisitId.Value,
|
VisitId = x.SourceSubjectVisitId.Value,
|
||||||
|
CrterionDictionaryGroup= x.CrterionDictionaryGroup,
|
||||||
BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
|
BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
|
||||||
.Select(y => new GlobalQuestionInfo()
|
.Select(y => new GlobalQuestionInfo()
|
||||||
{
|
{
|
||||||
|
@ -449,6 +449,27 @@ namespace IRaCIS.Application.Services
|
||||||
ValueCN = x.Dictionary.ValueCN
|
ValueCN = x.Dictionary.ValueCN
|
||||||
}).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
|
}).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
|
||||||
result.AssessTypeList = assessTypeList;
|
result.AssessTypeList = assessTypeList;
|
||||||
|
|
||||||
|
|
||||||
|
// 返回之前处理字典
|
||||||
|
result.TaskList.ForEach(x =>
|
||||||
|
{
|
||||||
|
x.AfterQuestionList.ForEach(y =>
|
||||||
|
{
|
||||||
|
y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
|
||||||
|
});
|
||||||
|
|
||||||
|
x.BeforeQuestionList.ForEach(y =>
|
||||||
|
{
|
||||||
|
y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
|
||||||
|
});
|
||||||
|
|
||||||
|
x.AgreeOrNot.ForEach(y =>
|
||||||
|
{
|
||||||
|
y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
Loading…
Reference in New Issue