|
@@ -144,9 +144,7 @@ public class ReportController {
|
|
result.accumulate("basic_teacher", getTeacerJson(query));
|
|
result.accumulate("basic_teacher", getTeacerJson(query));
|
|
result.accumulate("basic_college", getCollegeJson(query));
|
|
result.accumulate("basic_college", getCollegeJson(query));
|
|
result.accumulate("basic_main_question", getGroupJson(subjectGroups));
|
|
result.accumulate("basic_main_question", getGroupJson(subjectGroups));
|
|
- if (subject.getObjectiveScore() > 0) {
|
|
|
|
- result.accumulate("basic_question_option", getOptionJson(query, reportSubject, paperType));
|
|
|
|
- }
|
|
|
|
|
|
+ result.accumulate("basic_question_option", getOptionJson(query, reportSubject, paperType));
|
|
result.accumulate("discrimination_level",
|
|
result.accumulate("discrimination_level",
|
|
getDiscrimination(query, paperType, reportSubject, subjectClasses, subjectGroups));
|
|
getDiscrimination(query, paperType, reportSubject, subjectClasses, subjectGroups));
|
|
result.accumulate("difficulty_level",
|
|
result.accumulate("difficulty_level",
|