diff --git a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs index 8815e09..ceeb559 100644 --- a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs +++ b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs @@ -60,7 +60,7 @@ namespace YD_AllHeartRates.Api.Services.Impl var studentList = await ( from s in _sportsContext.Student join c in _sportsContext.Class on s.ClassId equals c.Id - where s.SchoolCode == schoolCode + where s.SchoolCode == schoolCode && s.StudentStatus == 1 select new { s.StudentNo, s.Sex, c.GradeId }).ToListAsync(); res.GradeCount = gradeList.Count; @@ -149,7 +149,7 @@ namespace YD_AllHeartRates.Api.Services.Impl var studentList = await ( from s in _sportsContext.Student join c in _sportsContext.Class on s.ClassId equals c.Id - where c.SchoolCode == schoolCode && c.GradeId == gradeId + where c.SchoolCode == schoolCode && c.GradeId == gradeId && s.StudentStatus == 1 select new { s.StudentNo, s.Sex, ClassId = c.Id }).ToListAsync(); res.GradeName = classList.FirstOrDefault()?.GradeName ?? ""; @@ -231,7 +231,7 @@ namespace YD_AllHeartRates.Api.Services.Impl select new { c.GradeName, c.ClassName, t.TeacherName }).FirstOrDefaultAsync(); var studentList = await _sportsContext.Student - .Where(s => s.SchoolCode == schoolCode && s.ClassId == classId) + .Where(s => s.SchoolCode == schoolCode && s.ClassId == classId && s.StudentStatus == 1) .Select(s => new { s.StudentNo, s.StudentName, s.Age, s.Sex, s.Photo }).ToListAsync(); res.GradeName = classInfo?.GradeName ?? "";