PCWG间隔天数基线改为NA
parent
b66b3fcc6c
commit
bc3f5c9394
|
|
@ -102,6 +102,9 @@ 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();
|
||||||
|
|
@ -111,14 +114,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
|
|
||||||
if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
|
if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
|
||||||
{
|
{
|
||||||
if (item.Answer == "-1")
|
if (baseLineTaskid == item.VisitTaskId)
|
||||||
|
{
|
||||||
|
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