diff --git a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php index 2c7f0b4288726a17e5df8ad48bb60caff02d4fcf..868e1b68ef2f2162a00975148c9bfa971e355636 100644 --- a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php +++ b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php @@ -29,7 +29,8 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice if (!isset($table[$record['StudentID']])) continue; // skip fake - $rate = ($record['Semester'] + $record['Bonus'] + $record['Extra'] + $record['PreviousExam']); + $rate = ($record['Semester'] + $record['Bonus'] + $record['Extra'] + + max($record['PreviousExam'], $record['Exam'])); $rateSet = isset($record['Semester']) || isset($record['Bonus']) || isset($record['Extra']) || isset($record['PreviousExam']); $table[$record['StudentID']]['grades'][] = [