修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-11-21 11:17:54 +08:00
parent a019a542b0
commit 4d10db054c
2 changed files with 9 additions and 0 deletions

View File

@ -468,6 +468,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<DateTime?> LatestScanDateList { get; set; } public List<DateTime?> LatestScanDateList { get; set; }
/// <summary>
/// 单位
/// </summary>
public ValueUnit? Unit { get; set; }
public List<ReportChartData> ChartDataList { get; set; } public List<ReportChartData> ChartDataList { get; set; }

View File

@ -291,10 +291,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (item.Childrens.Any(x => x.QuestionMark == QuestionMark.IsLymph && x.Answer[i].Answer.EqEnum(ReadingYesOrNo.Yes))) if (item.Childrens.Any(x => x.QuestionMark == QuestionMark.IsLymph && x.Answer[i].Answer.EqEnum(ReadingYesOrNo.Yes)))
{ {
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer[i].Answer).FirstOrDefault()); chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x=>x.Unit).FirstOrDefault();
} }
else else
{ {
chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Answer[i].Answer).FirstOrDefault()); chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Unit).FirstOrDefault();
} }
} }
@ -314,6 +316,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.Where(x => x.QuestionId == inDto.QuestionId.Value).FirstOrDefault(); .Where(x => x.QuestionId == inDto.QuestionId.Value).FirstOrDefault();
if (question != null) if (question != null)
{ {
result.Unit = question.Unit;
ReportChartData chartData = new ReportChartData() ReportChartData chartData = new ReportChartData()
{ {
Name = question.QuestionName, Name = question.QuestionName,
@ -341,6 +344,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (lesion != null) if (lesion != null)
{ {
result.Unit = lesion.Unit;
ReportChartData chartData = new ReportChartData() ReportChartData chartData = new ReportChartData()
{ {
Name = lesion.QuestionName, Name = lesion.QuestionName,