XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Test_IRC_Net8
he 2026-01-04 12:29:22 +08:00
parent 987667f59f
commit 728727af54
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -485,7 +485,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Value=x Value=x
}).ToList()); }).ToList());
var r1baseLine= alldata.TaskQuestions var r1baseLine= r1.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.ExistDisease) .Where(x => x.QuestionType == QuestionType.ExistDisease)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@ -496,7 +496,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.ToList(); .ToList();
var r1data = alldata.TaskQuestions var r1data = r1.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor) .Where(x => x.QuestionType == QuestionType.Tumor)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@ -516,7 +516,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (criterion.ReadingType == ReadingMethod.Double) if (criterion.ReadingType == ReadingMethod.Double)
{ {
var r2baseLine = alldata.TaskQuestions var r2baseLine = r2.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.ExistDisease) .Where(x => x.QuestionType == QuestionType.ExistDisease)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@ -527,7 +527,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.ToList(); .ToList();
var r2data = alldata.TaskQuestions var r2data = r2.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor) .Where(x => x.QuestionType == QuestionType.Tumor)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@ -552,18 +552,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<ChartItem> BuildShowChartGroups(GetReadingReportEvaluationOutDto data, Arm arm) List<ChartItem> BuildShowChartGroups(GetReadingReportEvaluationOutDto data, Arm arm)
{ {
var groups = new List<ChartItem>(); var groups = new List<ChartItem>();
if (data.TaskQuestions == null || data.VisitTaskList == null) return groups; if (alldata.TaskQuestions == null || alldata.VisitTaskList == null) return groups;
foreach (var g in data.TaskQuestions) foreach (var g in alldata.TaskQuestions)
{ {
var items = g.Childrens?.Where(c => c.ShowChartTypeEnum != ShowChartType.NotShow).ToList() ?? new List<ReadingReportDto>(); var items = g.Childrens?.Where(c => c.ShowChartTypeEnum != ShowChartType.NotShow).ToList() ?? new List<ReadingReportDto>();
if (items.Count == 0) continue; if (items.Count == 0) continue;
var chartList = new List<ReportChartData>(); var chartList = new List<ReportChartData>();
foreach (var item in items) foreach (var item in items)
{ {
var itemdata= data.TaskQuestions.SelectMany(x => x.Childrens)
.Where(x => x.QuestionId == item.QuestionId)
.FirstOrDefault();
var cd = new ReportChartData var cd = new ReportChartData
{ {
Name = item.QuestionName, Name = item?.QuestionName??string.Empty,
Value = item.Answer?.Select(a => a.Answer).ToList() ?? new List<string>() Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List<string>()
}; };
chartList.Add(cd); chartList.Add(cd);
} }