diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index bc7bfae91..8a0264c40 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -6879,6 +6879,13 @@
+
+
+ 获取图表数据汇总
+
+
+
+
获取报告图表数据
@@ -14292,6 +14299,13 @@
+
+
+ 获取图表数据汇总
+
+
+
+
设置已阅读关键文件
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index ccef7b576..da8a2ab9e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -509,7 +509,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReportsChartSummaryOutDto
{
public EvaluationColumn Evaluation { get; set; }
- public List Charts { get; set; } = new List();
+
+ public List TargetCharts { get; set; } = new List();
+
+ public List QuestionCharts { get; set; } = new List();
}
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index c92ca92cf..23b808366 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -558,17 +558,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (r1Data != null)
{
var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1);
- result.Charts.Add(r1Target);
+ result.TargetCharts.Add(r1Target);
var r1Groups = BuildShowChartGroups(r1Data, Arm.DoubleReadingArm1);
- result.Charts.AddRange(r1Groups);
+ result.QuestionCharts.AddRange(r1Groups);
}
if (r2Data != null)
{
var r2Target = await BuildTargetChart(r2Data, Arm.DoubleReadingArm2);
- result.Charts.Add(r2Target);
+ result.TargetCharts.Add(r2Target);
var r2Groups = BuildShowChartGroups(r2Data, Arm.DoubleReadingArm2);
- result.Charts.AddRange(r2Groups);
+ result.QuestionCharts.AddRange(r2Groups);
}
return result;