Merge branch 'zhaoyue-dev4' into 'master'

FIX a score null bug



See merge request !49

@@ -2,7 +2,7 @@ git pull
 git add --all src/main/java/*
 git add --all src/main/java/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "ADD member pulse and breathrate"
+git commit -m "FIX a score null bug"
 #git push origin master
 #git push origin master
 git push origin zhaoyue-dev4
 git push origin zhaoyue-dev4
 git status
 git status

@@ -83,7 +83,7 @@ public class ReportController {
         XklAmpReportEntity report = xklAmpReportRespository.findOne(report_id);
         XklAmpReportEntity report = xklAmpReportRespository.findOne(report_id);
         Map<Integer,ReportTypeModel> reportTypeMap = new HashMap<>();
         Map<Integer,ReportTypeModel> reportTypeMap = new HashMap<>();
         if (report != null) {
         if (report != null) {
-            if (report.getScore() - 0 < Constants.SMALL_DOUBLE || report.getScore() == null) {//首次调用接口，score为0
+            if (report.getScore() == null || report.getScore() - 0 < Constants.SMALL_DOUBLE) {//首次调用接口，score为0
                 scoreService.getScore(report_id);
                 scoreService.getScore(report_id);
             }
             }
             List<XklAmpReportDetailEntity> reportDetailEntityList = xklAmpReportDetailRespository.findAllByReportId(report_id);
             List<XklAmpReportDetailEntity> reportDetailEntityList = xklAmpReportDetailRespository.findAllByReportId(report_id);