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

修改

Test_IRC_Net8
he 2026-01-04 10:41:52 +08:00
parent 3ad6fad018
commit af1ca2ffc1
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,6 +445,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var result= new GetReportsChartSummaryOutDto(); var result= new GetReportsChartSummaryOutDto();
var r1Data = await GetData(new List<Arm>() { Arm.SingleReadingArm, Arm.DoubleReadingArm1 }); var r1Data = await GetData(new List<Arm>() { Arm.SingleReadingArm, Arm.DoubleReadingArm1 });
var r2Data = await GetData(new List<Arm>() { Arm.DoubleReadingArm2 }); var r2Data = await GetData(new List<Arm>() { Arm.DoubleReadingArm2 });
var alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data;
var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList();
var length = alldata.VisitTaskList.Count();
async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms) async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms)
{ {
var data = new GetReadingReportEvaluationOutDto() { }; var data = new GetReadingReportEvaluationOutDto() { };
@ -475,14 +480,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Evaluation = new List<List<EvaluationValue>>() { } Evaluation = new List<List<EvaluationValue>>() { }
}; };
var data = r1.VisitTaskList.Count() > r2.VisitTaskList.Count() ? r1 : r2;
var visitTaskName = data.VisitTaskList.Select(x => x.BlindName).ToList();
var length = data.VisitTaskList.Count();
result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() {
Value=x Value=x
}).ToList()); }).ToList());
var r1baseLine= data.TaskQuestions var r1baseLine= alldata.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
@ -493,7 +496,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.ToList(); .ToList();
var r1data = data.TaskQuestions var r1data = alldata.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
@ -511,34 +514,37 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
result.Evaluation.Add(r1data); result.Evaluation.Add(r1data);
if (criterion.ReadingType == ReadingMethod.Double)
var r2baseLine = data.TaskQuestions {
.SelectMany(x => x.Childrens) var r2baseLine = alldata.TaskQuestions
.Where(x => x.QuestionType == QuestionType.ExistDisease) .SelectMany(x => x.Childrens)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .Where(x => x.QuestionType == QuestionType.ExistDisease)
{ .SelectMany(x => x.Answer.Select(a => new EvaluationValue
DictionaryCode = x.DictionaryCode, {
Value = a.Answer DictionaryCode = x.DictionaryCode,
})) Value = a.Answer
.ToList(); }))
var r2data = data.TaskQuestions
.SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue
{
DictionaryCode = x.DictionaryCode,
Value = a.Answer
}))
.ToList();
r2data = r2baseLine.Take(1).Concat(r2data.Skip(1)).ToList();
r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
.Take(length)
.ToList(); .ToList();
result.Evaluation.Add(r2data);
var r2data = alldata.TaskQuestions
.SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue
{
DictionaryCode = x.DictionaryCode,
Value = a.Answer
}))
.ToList();
r2data = r2baseLine.Take(1).Concat(r2data.Skip(1)).ToList();
r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
.Take(length)
.ToList();
result.Evaluation.Add(r2data);
}
return result; return result;
} }