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

Test_IRC_Net8
he 2025-12-29 16:58:24 +08:00
parent e94e875a8a
commit c8e5a5173c
3 changed files with 22 additions and 5 deletions

View File

@ -6879,6 +6879,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReportsChartSummary(IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartSummaryInDto)">
<summary>
获取图表数据汇总
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReportsChartData(IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataInDto)"> <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReportsChartData(IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataInDto)">
<summary> <summary>
获取报告图表数据 获取报告图表数据
@ -14292,6 +14299,13 @@
<param name=""></param> <param name=""></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetReportsChartSummary(IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartSummaryInDto)">
<summary>
获取图表数据汇总
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SetReadKeyFile(IRaCIS.Core.Application.Service.Reading.Dto.SetReadKeyFileInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SetReadKeyFile(IRaCIS.Core.Application.Service.Reading.Dto.SetReadKeyFileInDto)">
<summary> <summary>
设置已阅读关键文件 设置已阅读关键文件

View File

@ -509,7 +509,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReportsChartSummaryOutDto public class GetReportsChartSummaryOutDto
{ {
public EvaluationColumn Evaluation { get; set; } public EvaluationColumn Evaluation { get; set; }
public List<ChartItem> Charts { get; set; } = new List<ChartItem>();
public List<ChartItem> TargetCharts { get; set; } = new List<ChartItem>();
public List<ChartItem> QuestionCharts { get; set; } = new List<ChartItem>();
} }

View File

@ -558,17 +558,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (r1Data != null) if (r1Data != null)
{ {
var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1); var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1);
result.Charts.Add(r1Target); result.TargetCharts.Add(r1Target);
var r1Groups = BuildShowChartGroups(r1Data, Arm.DoubleReadingArm1); var r1Groups = BuildShowChartGroups(r1Data, Arm.DoubleReadingArm1);
result.Charts.AddRange(r1Groups); result.QuestionCharts.AddRange(r1Groups);
} }
if (r2Data != null) if (r2Data != null)
{ {
var r2Target = await BuildTargetChart(r2Data, Arm.DoubleReadingArm2); var r2Target = await BuildTargetChart(r2Data, Arm.DoubleReadingArm2);
result.Charts.Add(r2Target); result.TargetCharts.Add(r2Target);
var r2Groups = BuildShowChartGroups(r2Data, Arm.DoubleReadingArm2); var r2Groups = BuildShowChartGroups(r2Data, Arm.DoubleReadingArm2);
result.Charts.AddRange(r2Groups); result.QuestionCharts.AddRange(r2Groups);
} }
return result; return result;