fix bugs

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

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.biz.report.service.impl;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -91,8 +92,9 @@ public class ReportSubjectQuestionServiceImpl extends BaseQueryService<ReportSub
                                 .toArray(new Predicate[predicates.size()]));
                     }
                 }, query);
-        List<ReportSubjectQuestion> list = result.getContent();
-        list = questionSort(list);
+        List<ReportSubjectQuestion> list = new ArrayList<ReportSubjectQuestion>();
+        list.addAll(result.getContent());
+        questionSort(list);
         return list;
     }
 
@@ -115,7 +117,7 @@ public class ReportSubjectQuestionServiceImpl extends BaseQueryService<ReportSub
             String subjectCode, boolean objective, String paperType) {
         List<ReportSubjectQuestion> list = reportSubjectQuestionDao.findByExamIdAndSubjectCodeAndObjectiveAndPaperType(
                 examId, subjectCode, objective, paperType, new Sort(Direction.ASC, "mainNumber", "subNumber"));
-        list = questionSort(list);
+        questionSort(list);
         return list;
     }
 

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

@@ -62,7 +62,8 @@ public class SubjectGroupModule implements Module {
                 group = new QuestionGroup(objective, question.getMainNumber(), question.getPaperType());
                 map.put(groupKey, group);
             }
-            group.incrTotalScore(item != null && item.getScore() != UN_SELECTIVE_SCORE ? item.getScore() : 0);
+            double score = item != null && item.getScore() != UN_SELECTIVE_SCORE ? item.getScore() : 0;
+            group.incrTotalScore(score);
             group.incrFullScore(question.getTotalScore());
         }
         for (Entry<String, QuestionGroup> entry : map.entrySet()) {