修改
This commit is contained in:
@@ -202,11 +202,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||
foreach (var task in taskInfoList)
|
||||
{
|
||||
|
||||
var answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).FirstOrDefault();
|
||||
question.Answer.Add(new TaskQuestionAnswer()
|
||||
{
|
||||
Answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
|
||||
Answer = answer == null ? string.Empty : answer.Answer,
|
||||
IsGlobalChange = answer == null ? false : answer.IsGlobalChange,
|
||||
GlobalChangeAnswer = answer == null ? string.Empty : answer.GlobalChangeAnswer,
|
||||
TaskName = task.TaskName,
|
||||
VisitTaskId = task.VisitTaskId,
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -180,11 +180,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||
foreach (var task in taskInfoList)
|
||||
{
|
||||
|
||||
var answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).FirstOrDefault();
|
||||
question.Answer.Add(new TaskQuestionAnswer()
|
||||
{
|
||||
Answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
|
||||
Answer = answer==null?string.Empty:answer.Answer,
|
||||
IsGlobalChange = answer == null ? false : answer.IsGlobalChange,
|
||||
GlobalChangeAnswer = answer == null ? string.Empty : answer.GlobalChangeAnswer,
|
||||
TaskName = task.TaskName,
|
||||
VisitTaskId = task.VisitTaskId,
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -192,11 +192,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||
foreach (var task in taskInfoList)
|
||||
{
|
||||
|
||||
var answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).FirstOrDefault();
|
||||
question.Answer.Add(new TaskQuestionAnswer()
|
||||
{
|
||||
Answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
|
||||
Answer = answer == null ? string.Empty : answer.Answer,
|
||||
IsGlobalChange = answer == null ? false : answer.IsGlobalChange,
|
||||
GlobalChangeAnswer = answer == null ? string.Empty : answer.GlobalChangeAnswer,
|
||||
TaskName = task.TaskName,
|
||||
VisitTaskId = task.VisitTaskId,
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user