Merge branch 'master' into dev_190520

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectQuestion.java

@@ -54,7 +54,7 @@ public class ReportSubjectQuestion implements Serializable {
      * 题目名称
      */
     @ExcelField(title = "题目名称", align = 2, sort = 30)
-    @Column(name = "question_Name", length = 128)
+    @Column(name = "question_name", length = 128)
     private String questionName;
 
     /**

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

@@ -46,7 +46,7 @@ public class SubjectRangeModule implements Module {
             subjectRange.setCount60_69(counter.countGeAndLt(60d, 70d));
             subjectRange.setCount70_79(counter.countGeAndLt(70d, 80d));
             subjectRange.setCount80_89(counter.countGeAndLt(80d, 90d));
-            subjectRange.setCount90_100(counter.countGeAndLt(90d, 100d));
+            subjectRange.setCount90_100(counter.countGeAndLt(90d, null));
             subjectRange.setLt60(counter.countGeAndLt(0d, 60d));
             subjectRange.setMte60(counter.countGeAndLt(60d, null));
             subjectRange.setTotalCount(counter.totalCount);
@@ -55,7 +55,7 @@ public class SubjectRangeModule implements Module {
             subjectRange.setPercent60_69(counter.countGeAndLt(60d, 70d) * 1.0 / counter.totalCount);
             subjectRange.setPercent70_79(counter.countGeAndLt(70d, 80d) * 1.0 / counter.totalCount);
             subjectRange.setPercent80_89(counter.countGeAndLt(80d, 90d) * 1.0 / counter.totalCount);
-            subjectRange.setPercent90_100(counter.countGeAndLt(90d, 100d) * 1.0 / counter.totalCount);
+            subjectRange.setPercent90_100(counter.countGeAndLt(90d, null) * 1.0 / counter.totalCount);
             subjectRange.setPercent_lt60(counter.countGeAndLt(0d, 60d) * 1.0 / counter.totalCount);
             subjectRange.setPercent_mte60(counter.countGeAndLt(60d, null) * 1.0 / counter.totalCount);
             service.save(subjectRange);