Compare commits
No commits in common. "7ace6c35937d8fb7b155156eca06c93cda5bc755" and "4f77d1bfb31f09673b6ee370685ca70f3f3769cb" have entirely different histories.
7ace6c3593
...
4f77d1bfb3
|
|
@ -529,27 +529,12 @@ namespace IRaCIS.Application.Services
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
|
if (taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder != ReadingOrder.InOrder)
|
||||||
switch (taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
|
|
||||||
{
|
{
|
||||||
case ReadingOrder.InOrder:
|
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
||||||
/// 有序不做处理
|
|
||||||
break;
|
|
||||||
case ReadingOrder.Random:
|
|
||||||
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
|
||||||
break;
|
|
||||||
case ReadingOrder.SubjectRandom:
|
|
||||||
// 受试者随机 当前任务为第一个 其他的 随机
|
|
||||||
var self = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).FirstOrDefault();
|
|
||||||
Random random = new Random();
|
|
||||||
var otherList = result.Where(x => x.VisitTaskId != inDto.VisitTaskId).OrderBy(x => random.Next()).ToList();
|
|
||||||
var newList = new List<GetRelatedVisitTaskOutDto>() { self };
|
|
||||||
newList.AddRange(otherList);
|
|
||||||
result = newList;
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var visitaskIds = result.Select(x => x.VisitTaskId).ToList();
|
var visitaskIds = result.Select(x => x.VisitTaskId).ToList();
|
||||||
|
|
||||||
var otherStudys = await _readingTableAnswerRowInfoRepository.Where(x => visitaskIds.Contains(x.VisitTaskId))
|
var otherStudys = await _readingTableAnswerRowInfoRepository.Where(x => visitaskIds.Contains(x.VisitTaskId))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue