Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -93,7 +93,7 @@ public class MsSuspected {
     private Integer score;
 
     @TableField("score_rezult")
-    private Integer score_rezult;
+    private Integer scoreRezult;
 
     @TableField(exist = false)
     private String diarrheaStr = "";

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

@@ -123,7 +123,7 @@ public class MsSuspectedService {
             msSuspected.setSingleRoom(singleRoom);
             msSuspected.setOthers(others);
             msSuspected.setSuspectedStatus(suspectedStatus);
-           // msSuspected.setScoreRezult(scoreRezult);
+            msSuspected.setScoreRezult(scoreRezult);
             msSuspected.setScore(score);
             msSuspected.setScoreHistroy(scoreHistroy);
             msSuspected.setTemperatureScore(temperatureScore);
@@ -159,7 +159,7 @@ public class MsSuspectedService {
                 msSuspected1.setDiarrhea(diarrhea);
                 msSuspected1.setSingleRoom(singleRoom);
                 msSuspected1.setOthers(others);
-               // msSuspected1.setScoreRezult(scoreRezult);
+                msSuspected1.setScoreRezult(scoreRezult);
                 msSuspected1.setScore(score);
                 msSuspected1.setScoreHistroy(scoreHistroy);
                 msSuspected1.setTemperatureScore(temperatureScore);
@@ -234,7 +234,7 @@ public class MsSuspectedService {
         msSuspected.setScore(addScore(temperature, cough, muscle, dyspnea, fatigue, diarrhea));
         Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
         msSuspected.setScoreHistroy(scoreHistroy);
-       // msSuspected.setScoreRezult(scoreRezulte(msSuspected.getScoreHistroy(), msSuspected.getScore()));
+        msSuspected.setScoreRezult(scoreRezulte(msSuspected.getScoreHistroy(), msSuspected.getScore()));
         return msSuspected;
     }