Merge branch 'zhaoyue-dev4' into 'master'

FIX test items score =0; add yindao log



See merge request !50

@@ -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 "FIX a score null bug"
+git commit -m "FIX test items score =0; add yindao log"
 #git push origin master
 #git push origin master
 git push origin zhaoyue-dev4
 git push origin zhaoyue-dev4
 git status
 git status

@@ -59,6 +59,8 @@ public class PulseBreathSetController {
         memberEntity.setCurPulse(pulse);
         memberEntity.setCurPulse(pulse);
         memberEntity.setCurBreathrate(breathrate);
         memberEntity.setCurBreathrate(breathrate);
         memberRespository.save(memberEntity);
         memberRespository.save(memberEntity);
+        // 0 新用户注册；1 体检； 2 老用户引导； 3 问诊；
+        adminOpsService.addOperation(admin.getId(), user.getMemberId(), 2);
         return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK);
         return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK);
     }
     }
 }
 }

@@ -134,7 +134,7 @@ public class ReportController {
                         if(!reportTypeMap.containsKey(Constants.testItemType)){
                         if(!reportTypeMap.containsKey(Constants.testItemType)){
                             //test项目一份
                             //test项目一份
                             ReportTypeModel reportTypeModel_test = new ReportTypeModel();
                             ReportTypeModel reportTypeModel_test = new ReportTypeModel();
-                            reportTypeModel_test.setTypeHealthScore(0);//测试项目没有打分
+                            reportTypeModel_test.setTypeHealthScore(report.getScore().doubleValue());//测试项目为总分
                             reportTypeModel_test.setType(Constants.testItemType);
                             reportTypeModel_test.setType(Constants.testItemType);
                             List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>();
                             List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>();
                             reportDetailModelList_test.add(reportDetail);
                             reportDetailModelList_test.add(reportDetail);