Merge branch 'zhaoyue-dev' into 'master'

Fix little bug



See merge request !10

 git add --all src/*
 git add --all src/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "ADD code for uspih "
+git commit -m "Fix little bug"
 git push origin zhaoyue-dev
 git push origin zhaoyue-dev
 git status
 git status

@@ -126,7 +126,7 @@ public class ReportController {
         double score = 0;
         double score = 0;
         XklAmpReportEntity report=xklAmpReportRespository.findOne(report_id);
         XklAmpReportEntity report=xklAmpReportRespository.findOne(report_id);
         if(report != null ){
         if(report != null ){
-            if(report.getScore()==0){//首次调用接口，score为0
+            if (report.getScore() == 0 || report.getScore() == null) {//首次调用接口，score为0
                 //TODO:可以在上传时直接打分？
                 //TODO:可以在上传时直接打分？
                 //单独测试需要删除xkl_amp_report_health_scroe表中数据
                 //单独测试需要删除xkl_amp_report_health_scroe表中数据
                 score = scoreService.getScore(report_id);
                 score = scoreService.getScore(report_id);