diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index cf0fb265e..fb95d88cd 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -15909,7 +15909,7 @@ - 发送影像重传相关邮件的通用方法 + 发送影像重传相关邮件的通用方法 已经处理项目 @@ -15924,7 +15924,7 @@ - 发送阅片人筛选相关邮件的通用方法 + 发送阅片人筛选相关邮件的通用方法 已经处理项目 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index e4819690c..2b792748e 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -449,6 +449,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data; var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList(); var length = alldata.VisitTaskList.Count(); + + // -1转为空 + List negativeToString = new List() + { + QuestionType.DaysBetween, + }; async Task GetData(List arms) { @@ -568,6 +574,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate Name = item?.QuestionName??string.Empty, Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List() }; + if (negativeToString.Contains(item.QuestionType)) + { + cd.Value.ForEach(item1 => + { + item1 = item1 == "-1" ? string.Empty : item1; + }); + } chartList.Add(cd); } groups.Add(new ChartItem @@ -627,6 +640,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate result.QuestionCharts.AddRange(r2Groups); } + if (criterion.CriterionType == CriterionType.PCWG3) + { + result.TargetCharts = new List() { }; + } return result; }