diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs index 6fd424a87..fe6cdc35d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs @@ -162,7 +162,7 @@ public class TrialStatService( { Id = t.Id, SubjectId = t.SubjectId, - TrialSiteCode=t.Subject.TrialSite.TrialSiteCode, + TrialSiteCode = t.Subject.TrialSite.TrialSiteCode, SubjectCode = t.Subject.Code, VisitTaskNum = t.VisitTaskNum, TaskName = t.TaskName, @@ -237,7 +237,7 @@ public class TrialStatService( DictionaryCode = g.FirstOrDefault()?.DictionaryCode, OverallTumorEvaluation = g.Key, Code = g.Key, - SubjectCodeList = g.Select(t => new EfficacyEvaluationSubjectInfo { SubjectCode= t.SubjectCode, TrialSiteCode=t.TrialSiteCode }).Distinct().ToList() + SubjectCodeList = g.Select(t => new EfficacyEvaluationSubjectInfo { SubjectCode = t.SubjectCode, TrialSiteCode = t.TrialSiteCode }).Distinct().ToList() }).ToList(); @@ -255,7 +255,8 @@ public class TrialStatService( t.Dictionary.Value, }) .ToList() - .Where(t => t.Code != "-1") + .WhereIf(criterion.CriterionType != CriterionType.PCWG3, t => t.Code != "-1") + .WhereIf(criterion.CriterionType == CriterionType.PCWG3, t => t.Code != "5") .Select(t => new EfficacyEvaluationStatViewModel { DictionaryCode = dicName, @@ -334,7 +335,7 @@ public class TrialStatService( .ToList(); - return ResponseOutput.Ok(translateList, new { PDList = firstPdList, ORR = orrPercent,SiteORRList= centerOrrList }); + return ResponseOutput.Ok(translateList, new { PDList = firstPdList, ORR = orrPercent, SiteORRList = centerOrrList }); }