修改统计质询
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2026-01-04 16:46:10 +08:00
parent 4465e19987
commit 3a2c78fe37
2 changed files with 6 additions and 2 deletions

View File

@ -46,6 +46,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? TrialSiteId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
}
public class VisitQuestionViewModel

View File

@ -95,10 +95,12 @@ public class TrialStatService(
MedicalReviewQuestion_ClosedCount = t.TaskMedicalReviewList.Where(t => inQuery.TrialSiteId != null ? t.VisitTask.Subject.TrialSiteId == inQuery.TrialSiteId : true)
.Where(t => inQuery.TrialReadingCriterionId != null ? t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId : true)
.Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog).Count(),
MedicalReviewQuestion_IngCount = t.TaskMedicalReviewList.Where(t => inQuery.TrialSiteId != null ? t.VisitTask.Subject.TrialSiteId == inQuery.TrialSiteId : true)
.Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog == false).Count(),
.Where(t => inQuery.TrialReadingCriterionId != null ? t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId : true)
.Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog == false && t.IsHaveQuestion == true).Count(),
}).FirstOrDefaultAsync();
@ -218,7 +220,7 @@ public class TrialStatService(
);
//找到裁判选择了的,否则就不算,并且排除基线 按照每个subject分组取最后一次访视
list = list.Where(t => t.IsJudgeSelect == true && t.VisitTaskNum != 0 && t.ReadingCategory==ReadingCategory.Visit)//全局的答案已经放在对应访视上了
list = list.Where(t => t.IsJudgeSelect == true && t.VisitTaskNum != 0 && t.ReadingCategory == ReadingCategory.Visit)//全局的答案已经放在对应访视上了
.GroupBy(t => t.SubjectCode).Select(g => g.OrderByDescending(t => t.VisitTaskNum).First()).ToList();