Compare commits
No commits in common. "90a302193843d3214a10f0a98db9c984a6eefb45" and "9e3eafa92554387f4b1007f618d80bf635477e07" have entirely different histories.
90a3021938
...
9e3eafa925
|
|
@ -102,9 +102,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
|
taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var baseLineTaskid= relatedVisitTask.Item1[0].VisitTaskId== taskIds[0] ? relatedVisitTask.Item1[0].VisitTaskId: Guid.Empty();
|
|
||||||
|
|
||||||
relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
|
relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
|
||||||
// 所有访视问题的答案
|
// 所有访视问题的答案
|
||||||
var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
|
var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
|
||||||
|
|
@ -114,21 +111,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
|
|
||||||
if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
|
if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
|
||||||
{
|
{
|
||||||
if (baseLineTaskid == item.VisitTaskId)
|
if (item.Answer == "-1")
|
||||||
{
|
|
||||||
if (item.Answer == "-1" )
|
|
||||||
{
|
|
||||||
item.Answer = "NA";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (item.Answer == "-1" || item.Answer == string.Empty)
|
|
||||||
{
|
{
|
||||||
item.Answer = _localizer["CriterionCalculateExport_Unknown"];
|
item.Answer = _localizer["CriterionCalculateExport_Unknown"];
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue