Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
bf8938ea31
|
@ -205,12 +205,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
// 这里统一处理字典
|
||||
|
||||
var dictionaryGroup = result.VisitTaskList.ToDictionary(x => x.VisitTaskId, x => x.CrterionDictionaryGroup);
|
||||
Dictionary<Guid,List<CrterionDictionaryGroup>> dictionaryGroup = result.VisitTaskList.ToDictionary(x => x.VisitTaskId, x => x.CrterionDictionaryGroup);
|
||||
|
||||
result.TaskQuestions.ForEach(y =>
|
||||
{
|
||||
SetCrterionDictionaryGroup(y, dictionaryGroup);
|
||||
});
|
||||
|
||||
y.Answer.ForEach(z =>
|
||||
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new GetReadingReportEvaluationOutDto();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void SetCrterionDictionaryGroup(ReadingReportDto item, Dictionary<Guid, List<CrterionDictionaryGroup>> dictionaryGroup)
|
||||
{
|
||||
item.Answer.ForEach(z =>
|
||||
{
|
||||
try
|
||||
{
|
||||
|
@ -222,16 +236,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
}
|
||||
});
|
||||
|
||||
item.Childrens.ForEach(x => {
|
||||
|
||||
SetCrterionDictionaryGroup(x, dictionaryGroup);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new GetReadingReportEvaluationOutDto();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue