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/TrialSiteUser/DTO/TrialStatViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs index cc48a775c..b38ff1f96 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs @@ -114,6 +114,18 @@ namespace IRaCIS.Core.Application.ViewModel return null; } } + + public double? MonthsDiff + { + get + { + if (DaysDiff.HasValue) + { + return Math.Round(DaysDiff.Value / 30.0, 1, MidpointRounding.AwayFromZero); + } + return null; + } + } } public class EfficacyEvaluationStatViewModel diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs index 62ffbf8ba..63d14b0cf 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs @@ -273,8 +273,9 @@ public class TrialStatService( : "0.00%"; var pdInfo = translateList - .WhereIf(criterion.CriterionType == CriterionType.IRECIST1Point1, t => t.OverallTumorEvaluation == "ICPD") - .WhereIf(criterion.CriterionType == CriterionType.RECIST1Point1, t => t.OverallTumorEvaluation == "PD") + .WhereIf(criterion.CriterionType == CriterionType.IRECIST1Point1, t => t.OverallTumorEvaluation == "iCPD") + .WhereIf(criterion.CriterionType == CriterionType.Lugano2014, t => t.OverallTumorEvaluation == "PMD/PD") + .WhereIf(criterion.CriterionType != CriterionType.IRECIST1Point1 && criterion.CriterionType != CriterionType.IRECIST1Point1, t => t.OverallTumorEvaluation == "PD") .FirstOrDefault(); var firstPdList = new List();