This commit is contained in:
tanglong 2025-06-11 17:10:15 +08:00
parent e650df7a03
commit 1a4095ad6f

View File

@ -426,21 +426,20 @@ namespace YD_WeChatApplet.Services
foreach (var item in studentTrainingRecordList) 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 stu = students.FirstOrDefault(x => x.StudentNo == item.StudentNo);
var student = new StudentTrainingRecordDto() if (studentTrainingData.Count > 0)
{
studentList.Add(new StudentTrainingRecordDto()
{ {
StudentNo = stu?.StudentNo, StudentNo = stu?.StudentNo,
Age = stu?.Age ?? item.Age, Age = stu?.Age ?? item.Age,
Sex = stu?.Sex ?? item.Sex Sex = stu?.Sex ?? item.Sex,
}; StudentName = stu?.StudentName,
Photo = stu?.Photo ?? ""
student.StudentName = stu?.StudentName; });
student.Photo = stu?.Photo ?? ""; }
studentList.Add(student);
} }
res.HeartRateTrend = GetHeartRateTrend(heartRateDataList); res.HeartRateTrend = GetHeartRateTrend(heartRateDataList);