修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
9012b9c35c
commit
051094a742
|
|
@ -66,6 +66,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
foreach (var item in questions)
|
foreach (var item in questions)
|
||||||
{
|
{
|
||||||
item.QuestionName = item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us);
|
item.QuestionName = item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us);
|
||||||
|
item.GroupName = item.GroupName.LanguageName(item.GroupEnName, _userInfo.IsEn_Us);
|
||||||
item.ReportLayType = ReportLayType.Group;
|
item.ReportLayType = ReportLayType.Group;
|
||||||
|
|
||||||
item.Childrens = _mapper.Map<List<ReadingReportDto>>(questionList.Where(x => x.GroupId == item.QuestionId).OrderBy(x => x.ShowOrder));
|
item.Childrens = _mapper.Map<List<ReadingReportDto>>(questionList.Where(x => x.GroupId == item.QuestionId).OrderBy(x => x.ShowOrder));
|
||||||
|
|
|
||||||
|
|
@ -614,7 +614,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
Arm = arm,
|
Arm = arm,
|
||||||
ChartType = null,
|
ChartType = null,
|
||||||
GroupName = g.QuestionName,
|
GroupName = g.GroupName,
|
||||||
Unit = items.FirstOrDefault()?.Unit,
|
Unit = items.FirstOrDefault()?.Unit,
|
||||||
VisitTaskNameList = alldata.VisitTaskList.Select(x => x.BlindName).ToList(),
|
VisitTaskNameList = alldata.VisitTaskList.Select(x => x.BlindName).ToList(),
|
||||||
LatestScanDateList = alldata.VisitTaskList.Select(x => x.LatestScanDate).ToList(),
|
LatestScanDateList = alldata.VisitTaskList.Select(x => x.LatestScanDate).ToList(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue