fangyeqing / xkl-interface · Commits

Go to a project

Authored by zhaoyue
Commit cf24a748c784da4cd37e9d44e06a9f4b5a0c01ff 1 parent 7022e3a8

FIX a score null bug

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -2,7 +2,7 @@ git pull @@ -2,7 +2,7 @@ git pull
2 git add --all src/main/java/* 2 git add --all src/main/java/*
3 git add push.sh 3 git add push.sh
4 git add pom.xml 4 git add pom.xml
5 -git commit -m "ADD member pulse and breathrate" 5 +git commit -m "FIX a score null bug"
6 #git push origin master 6 #git push origin master
7 git push origin zhaoyue-dev4 7 git push origin zhaoyue-dev4
8 git status 8 git status
@@ -83,7 +83,7 @@ public class ReportController { @@ -83,7 +83,7 @@ public class ReportController {
83 XklAmpReportEntity report = xklAmpReportRespository.findOne(report_id); 83 XklAmpReportEntity report = xklAmpReportRespository.findOne(report_id);
84 Map<Integer,ReportTypeModel> reportTypeMap = new HashMap<>(); 84 Map<Integer,ReportTypeModel> reportTypeMap = new HashMap<>();
85 if (report != null) { 85 if (report != null) {
86 - if (report.getScore() - 0 < Constants.SMALL_DOUBLE || report.getScore() == null) {//首次调用接口，score为0 86 + if (report.getScore() == null || report.getScore() - 0 < Constants.SMALL_DOUBLE) {//首次调用接口，score为0
87 scoreService.getScore(report_id); 87 scoreService.getScore(report_id);
88 } 88 }
89 List<XklAmpReportDetailEntity> reportDetailEntityList = xklAmpReportDetailRespository.findAllByReportId(report_id); 89 List<XklAmpReportDetailEntity> reportDetailEntityList = xklAmpReportDetailRespository.findAllByReportId(report_id);