|
@@ -215,13 +215,14 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
scores.Add(sc);
|
|
|
classTotal += sc;
|
|
|
}
|
|
|
+ scores = scores.Where(x => x > 0).ToList();
|
|
|
double maxc = scores.Max(s => Math.Abs(s));
|
|
|
double minc = scores.Min(s => Math.Abs(s));
|
|
|
double excellentc = scores.Where(s => s >= 75).Count();
|
|
|
double ex = Math.Round(excellentc / scores.Count,2);
|
|
|
double passc = scores.Where(s => s >= 60).Count();
|
|
|
double pa = Math.Round(passc / scores.Count, 2);
|
|
|
- clsInfo.Add((cls.id, classTotal / cls.members.Count, maxc, minc, ex, pa));
|
|
|
+ clsInfo.Add((cls.id, classTotal / scores.Count, maxc, minc, ex, pa));
|
|
|
}
|
|
|
//班级信息
|
|
|
var cInfo = clsInfo.Select(x => new
|
|
@@ -236,7 +237,7 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
examResults[0].classes.Where(c => c.id.Equals(x.cId)).FirstOrDefault().gradeId
|
|
|
});
|
|
|
//年级信息
|
|
|
- var grades = students.GroupBy(c => c.gradeId).Select(x => new { gradeId = x.Key, list = x.ToList().Select(v => v.score) });
|
|
|
+ var grades = students.GroupBy(c => c.gradeId).Select(x => new { gradeId = x.Key, list = x.ToList().Select(v => v.score).Where(c => c > 0) });
|
|
|
var gscore = grades.Select(x => new
|
|
|
{
|
|
|
id = x.gradeId,
|
|
@@ -278,7 +279,7 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
x.Key,
|
|
|
x.Value
|
|
|
});*/
|
|
|
- return Ok(new { count = tchList.Count, scount = stus.Count, max, min, average, excellent, pass, pow, students, cInfo, blk, kno, optCount, gscore });
|
|
|
+ return Ok(new { count = tchList.Count, scount = stus.Count - info.lostStu.Count, max, min, average, excellent, pass, pow, students, cInfo, blk, kno, optCount, gscore });
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|