FIX test items score =0; add yindao log
Showing
3 changed files
with
4 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 "FIX a score null bug" | 5 | +git commit -m "FIX test items score =0; add yindao log" |
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 |
@@ -59,6 +59,8 @@ public class PulseBreathSetController { | @@ -59,6 +59,8 @@ public class PulseBreathSetController { | ||
59 | memberEntity.setCurPulse(pulse); | 59 | memberEntity.setCurPulse(pulse); |
60 | memberEntity.setCurBreathrate(breathrate); | 60 | memberEntity.setCurBreathrate(breathrate); |
61 | memberRespository.save(memberEntity); | 61 | memberRespository.save(memberEntity); |
62 | + // 0 新用户注册;1 体检; 2 老用户引导; 3 问诊; | ||
63 | + adminOpsService.addOperation(admin.getId(), user.getMemberId(), 2); | ||
62 | return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK); | 64 | return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK); |
63 | } | 65 | } |
64 | } | 66 | } |
@@ -134,7 +134,7 @@ public class ReportController { | @@ -134,7 +134,7 @@ public class ReportController { | ||
134 | if(!reportTypeMap.containsKey(Constants.testItemType)){ | 134 | if(!reportTypeMap.containsKey(Constants.testItemType)){ |
135 | //test项目一份 | 135 | //test项目一份 |
136 | ReportTypeModel reportTypeModel_test = new ReportTypeModel(); | 136 | ReportTypeModel reportTypeModel_test = new ReportTypeModel(); |
137 | - reportTypeModel_test.setTypeHealthScore(0);//测试项目没有打分 | 137 | + reportTypeModel_test.setTypeHealthScore(report.getScore().doubleValue());//测试项目为总分 |
138 | reportTypeModel_test.setType(Constants.testItemType); | 138 | reportTypeModel_test.setType(Constants.testItemType); |
139 | List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>(); | 139 | List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>(); |
140 | reportDetailModelList_test.add(reportDetail); | 140 | reportDetailModelList_test.add(reportDetail); |
-
Please register or login to post a comment