中心调研修改,oss测试
This commit is contained in:
@@ -197,13 +197,14 @@ public class TrialStatService(
|
||||
var exceptVisit = list.Where(t => t.ReadingCategory == ReadingCategory.Visit)
|
||||
.GroupBy(t => new { t.SubjectCode, t.TaskName }).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList();
|
||||
|
||||
//将一个人做的访视任务过滤掉
|
||||
list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList();
|
||||
}
|
||||
|
||||
|
||||
list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
|
||||
|
||||
//处理裁判标记
|
||||
//处理裁判标记 是否触发裁判,裁判选择标记
|
||||
list = DealJudgeMark(criterion.ArbitrationRule, criterion.IsGlobalReading, list);
|
||||
|
||||
//基线(最晚拍片日期)-首次PD(所有触发PD的病灶的检查的最早拍片日期)的中位数,单位是天
|
||||
@@ -215,7 +216,7 @@ public class TrialStatService(
|
||||
g => g.First().LatestScanDate // 如果同一个 SubjectCode 有多条记录,只取第一条
|
||||
);
|
||||
|
||||
//一定要两个人做完了,产生了裁判并且有结果的,否则就不算,并且排除基线
|
||||
//找到裁判选择了的,否则就不算,并且排除基线 按照每个subject分组,取最后一次访视
|
||||
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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user