fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportSubjectClassGroupServiceImpl.java

@@ -80,7 +80,7 @@ public class ReportSubjectClassGroupServiceImpl extends BaseQueryService<ReportS
                         if (query.getObjective() != null) {
                             predicates.add(cb.equal(root.get("objective"), query.getObjective()));
                         }
-                        if (query.getObjective() != null && query.getObjective()) {
+                        if (query.getObjective() != null && query.getObjective()&& StringUtils.isNotBlank(query.getPaperType())) {
                             predicates.add(cb.equal(root.get("paperType"), query.getPaperType()));
                         }
                         return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportSubjectGroupServiceImpl.java

@@ -63,7 +63,7 @@ public class ReportSubjectGroupServiceImpl extends BaseQueryService<ReportSubjec
                 if (query.getGroupNumber() > 0) {
                     predicates.add(cb.equal(root.get("groupNumber"), query.getGroupNumber()));
                 }
-                if (query.getObjective() != null && query.getObjective()) {
+                if (query.getObjective() != null && query.getObjective() && StringUtils.isNotBlank(query.getPaperType())) {
                     predicates.add(cb.equal(root.get("paperType"), query.getPaperType()));
                 }
                 return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/ReportContext.java

@@ -180,8 +180,8 @@ public class ReportContext {
     public LevelRange[] getDifficulityLevelConfig() {
         LevelRange[] levels = new LevelRange[3];
         levels[0] = new LevelRange(null, null, sasConfigItem.getDifficultyHighValue(), null);
-        levels[1] = new LevelRange(null, sasConfigItem.getDifficultyMiddleValue(), null,
-                sasConfigItem.getDifficultyHighValue());
+        levels[1] = new LevelRange(null, sasConfigItem.getDifficultyHighValue(), null,
+                sasConfigItem.getDifficultyMiddleValue());
         levels[2] = new LevelRange(sasConfigItem.getDifficultyLowValue(), null, null, null);
         return levels;
     }
@@ -191,7 +191,7 @@ public class ReportContext {
         levels[0] = new LevelRange(null, sasConfigItem.getDiscriminationExcellentValue(), null, null);
         levels[1] = new LevelRange(null, sasConfigItem.getDiscriminationGoodValue(),
                 sasConfigItem.getDiscriminationExcellentValue(), null);
-        levels[2] = new LevelRange(null, sasConfigItem.getDiscriminationGeneralValue(),
+        levels[2] = new LevelRange(null, sasConfigItem.getDiscriminationBadValue(),
                 sasConfigItem.getDiscriminationGoodValue(), null);
         levels[3] = new LevelRange(null, null, sasConfigItem.getDiscriminationBadValue(), null);
         return levels;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectGroupModule.java

@@ -49,14 +49,15 @@ public class SubjectGroupModule implements Module {
         int scoreCount = scoreList.size();
         for (int i = 0; i < questionList.size(); i++) {
             ExamQuestion question = questionList.get(i);
+            String groupKey = question.getMainNumber() + "/t" + objective;
             if (question.getTotalScore() == null || question.getTotalScore() == 0) {
                 continue;
             }
             ScoreItem item = scoreCount > i ? scoreList.get(i) : null;
-            QuestionGroup group = map.get(question.getMainNumber());
+            QuestionGroup group = map.get(groupKey);
             if (group == null) {
                 group = new QuestionGroup(objective, question.getMainNumber(), question.getPaperType());
-                map.put(question.getMainNumber() + "/t" + objective, group);
+                map.put(groupKey, group);
             }
             group.incrTotalScore(item != null ? item.getScore() : 0);
             group.incrFullScore(question.getTotalScore());