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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build encountered an error Details

Test_IRC_Net8
hang 2026-01-06 10:27:53 +08:00
parent 951081edb7 7ceca5d802
commit ead07cb1ca
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,6 +449,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data; var alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data;
var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList(); var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList();
var length = alldata.VisitTaskList.Count(); var length = alldata.VisitTaskList.Count();
// -1转为空
List<QuestionType?> negativeToString = new List<QuestionType?>()
{
QuestionType.DaysBetween,
};
async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms) async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms)
{ {
@ -480,7 +486,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Evaluation = new List<List<EvaluationValue>>() { } Evaluation = new List<List<EvaluationValue>>() { }
}; };
var visitAnswerType = QuestionType.Tumor;
if (criterion.CriterionType == CriterionType.PCWG3)
{
visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
}
result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() {
Value=x Value=x
}).ToList()); }).ToList());
@ -498,7 +510,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var r1data = r1.TaskQuestions var r1data = r1.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor) .Where(x => x.QuestionType == visitAnswerType)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
{ {
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
@ -529,7 +541,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var r2data = r2.TaskQuestions var r2data = r2.TaskQuestions
.SelectMany(x => x.Childrens) .SelectMany(x => x.Childrens)
.Where(x => x.QuestionType == QuestionType.Tumor) .Where(x => x.QuestionType == visitAnswerType)
.SelectMany(x => x.Answer.Select(a => new EvaluationValue .SelectMany(x => x.Answer.Select(a => new EvaluationValue
{ {
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
@ -568,6 +580,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Name = item?.QuestionName??string.Empty, Name = item?.QuestionName??string.Empty,
Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List<string>() Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List<string>()
}; };
if (negativeToString.Contains(item.QuestionType))
{
cd.Value.ForEach(item1 =>
{
item1 = item1 == "-1" ? string.Empty : item1;
});
}
chartList.Add(cd); chartList.Add(cd);
} }
groups.Add(new ChartItem groups.Add(new ChartItem
@ -627,6 +646,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
result.QuestionCharts.AddRange(r2Groups); result.QuestionCharts.AddRange(r2Groups);
} }
if (criterion.CriterionType == CriterionType.PCWG3)
{
result.TargetCharts = new List<ChartItem>() { };
}
return result; return result;
} }