修改
This commit is contained in:
+17
-2
@@ -295,14 +295,29 @@ namespace IRaCIS.Core.Application.Service
|
||||
.Select(x => new
|
||||
{
|
||||
x.VisitTaskNum,
|
||||
x.TaskBlindName,
|
||||
x.Id
|
||||
}).ToListAsync();
|
||||
|
||||
|
||||
medicalReviewInfo.TaskList.ForEach(x =>
|
||||
{
|
||||
x.GlobalTaskId = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).Select(y => y.Id).FirstOrDefault();
|
||||
x.JudgeTaskId = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]).Select(y => y.Id).FirstOrDefault();
|
||||
|
||||
var visitGlobalInfo = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).FirstOrDefault();
|
||||
if (visitGlobalInfo != null)
|
||||
{
|
||||
x.GlobalTaskId = visitGlobalInfo.Id;
|
||||
x.GlobalTaskName = visitGlobalInfo.TaskBlindName;
|
||||
}
|
||||
|
||||
var visitJudgeInfo = globalTask.Where(y => y.VisitTaskNum == x.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]).FirstOrDefault();
|
||||
if (visitGlobalInfo != null)
|
||||
{
|
||||
x.JudgeTaskId = visitJudgeInfo.Id;
|
||||
x.JudgeTaskName = visitJudgeInfo.TaskBlindName;
|
||||
}
|
||||
|
||||
|
||||
x.IsGlobalChange = globalChangeAnswer.Any(y => y.TaskId == x.TaskId);
|
||||
x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user