touxiang
This commit is contained in:
parent
e650df7a03
commit
1a4095ad6f
@ -426,21 +426,20 @@ namespace YD_WeChatApplet.Services
|
||||
|
||||
foreach (var item in studentTrainingRecordList)
|
||||
{
|
||||
//var studentTrainingData = heartRateDataList.Where(x => x.StudentNo == item.StudentNo).ToList();
|
||||
|
||||
var studentTrainingData = heartRateDataList.Where(x => x.StudentNo == item.StudentNo).ToList();
|
||||
var stu = students.FirstOrDefault(x => x.StudentNo == item.StudentNo);
|
||||
|
||||
var student = new StudentTrainingRecordDto()
|
||||
if (studentTrainingData.Count > 0)
|
||||
{
|
||||
StudentNo = stu?.StudentNo,
|
||||
Age = stu?.Age ?? item.Age,
|
||||
Sex = stu?.Sex ?? item.Sex
|
||||
};
|
||||
|
||||
student.StudentName = stu?.StudentName;
|
||||
student.Photo = stu?.Photo ?? "";
|
||||
|
||||
studentList.Add(student);
|
||||
studentList.Add(new StudentTrainingRecordDto()
|
||||
{
|
||||
StudentNo = stu?.StudentNo,
|
||||
Age = stu?.Age ?? item.Age,
|
||||
Sex = stu?.Sex ?? item.Sex,
|
||||
StudentName = stu?.StudentName,
|
||||
Photo = stu?.Photo ?? ""
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
res.HeartRateTrend = GetHeartRateTrend(heartRateDataList);
|
||||
|
Loading…
x
Reference in New Issue
Block a user