Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -65,7 +65,9 @@ public class RiBaoService {
     public Integer getTemperatureScore(BigDecimal temperature) {
         Integer score = 0;
         //温度
-        if (Conv.NFloat(temperature) < Conv.NFloat(37.3))//37.3以下0分
+        if (Conv.NFloat(temperature) < Conv.NFloat(35))//35以下1分
+            score += 1;
+        if (Conv.NFloat(temperature) >= Conv.NFloat(35) && Conv.NFloat(temperature) < Conv.NFloat(37))//35-37.3以下0分
             score += 0;
         if (Conv.NFloat(temperature) >= Conv.NFloat(37.4) && Conv.NFloat(temperature) <= Conv.NFloat(38))//   37.3~38℃为 1分
             score += 1;
@@ -185,7 +187,7 @@ public class RiBaoService {
             ribaoDetail.setTimeUpdate(dateTime);
 
             //判断是否评估
-            if (ribaoDetail.getScoreRezult() == 0) {
+            if (null == ribaoDetail.getScoreRezult() || ribaoDetail.getScoreRezult() == 0) {
                 MsSuspected score = getScore(
                         ribaoDetail.getSuspectedId(),
                         ribaoDetail.getUserName(),
@@ -212,7 +214,7 @@ public class RiBaoService {
             ribaoDetail.setTimeUpdate(dateTime);
 
             //判断是否评估
-            if (ribaoDetail.getScoreRezult() == 0) {
+            if (null == ribaoDetail.getScoreRezult() || ribaoDetail.getScoreRezult() == 0) {
                 MsSuspected score = getScore(
                         0L,
                         ribaoDetail.getUserName(),

whepi-web/src/main/java/com/bofeng/wx/controller/RiBaoController.java

@@ -123,7 +123,10 @@ public class RiBaoController {
     // 健康评估 日报关联的家人
     @PostMapping("/riBao/getScore")
     public Model<MsSuspected> getScore(@JsonBody MsSuspected msSuspected) {
-        Long suspectedId = msSuspected.getSuspectedId();// 新增时传0
+        Long suspectedId = msSuspected.getSuspectedId();
+        if (null == suspectedId) {
+            suspectedId = 0L;
+        }// 新增时不传
         String userName = msSuspected.getUserName();
         Long userCreate = msSuspected.getUserCreate();
         Integer medical = msSuspected.getMedical();