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 is passing Details

Test_IRC_Net8
he 2026-01-05 10:00:12 +08:00
parent de29bd7d15 3a2c78fe37
commit 312c96ef8f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs
View File

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

6
IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs
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();