xielianghe

whepi-ui/templates/home/ribao.js

@@ -349,10 +349,13 @@ function ribao_cell(v) {
   var others = "";
   if (v.others != "")
     others = "其他：" + v.others;
+  var scoreRezult = "";
+  if (v.scoreRezult != 0)
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult) + "；";
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others +scoreRezult+ '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -634,9 +637,12 @@ function helpValue1(v) {
   var others = "";
   if (v.others != "")
     others = "其他：" + v.others;
+  var scoreRezult = "";
+  if (v.scoreRezult != 0)
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult) + "；";
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult+'</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -833,9 +839,9 @@ $('#ribao_score').on('click', function () {
         $('#js_input_score_rezult').empty();
         var ScoreRezult = getScoreRezult(data.scoreRezult);
         $("#js_input_score_rezult").val(ScoreRezult);
-        // $("#js_input_temperature_score").val(data.temperatureScore);
-        // $("#js_input_score_histroy").val(data.scoreHistory);
-        // $("#js_input_score").val(data.score);
+        $("#js_input_temperature_score").val(data.temperatureScore);
+        $("#js_input_score_histroy").val(data.scoreHistory);
+        $("#js_input_score").val(data.score);
       }
     },
   });

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

@@ -86,8 +86,8 @@ public class MsSuspected {
     @TableField("diarrhea")
     private Integer diarrhea;
 
-    @TableField("score_history")
-    private Integer scoreHistory;
+    @TableField("score_histroy")
+    private Integer scoreHistroy;
 
     @TableField("score")
     private Integer score;

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

@@ -121,7 +121,7 @@ public class MsSuspectedService {
             msSuspected.setSuspectedStatus(suspectedStatus);
             msSuspected.setScoreRezult(scoreRezult);
             msSuspected.setScore(score);
-            msSuspected.setScoreHistory(scoreHistroy);
+            msSuspected.setScoreHistroy(scoreHistroy);
             msSuspected.setTemperatureScore(temperatureScore);
             msSuspected.setUserCreate(userCreate);
             msSuspected.setTimeCreate(DateTime.now());
@@ -145,6 +145,10 @@ public class MsSuspectedService {
                 msSuspected1.setDiarrhea(diarrhea);
                 msSuspected1.setSingleRoom(singleRoom);
                 msSuspected1.setOthers(others);
+                msSuspected1.setScoreRezult(scoreRezult);
+                msSuspected1.setScore(score);
+                msSuspected1.setScoreHistroy(scoreHistroy);
+                msSuspected1.setTemperatureScore(temperatureScore);
                 msSuspected1.setSuspectedStatus(suspectedStatus);
                 msSuspectedMapper.updateById(msSuspected1);
             }
@@ -217,8 +221,8 @@ public class MsSuspectedService {
         Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName);
         if (scoreHistroy == null)
             scoreHistroy = 0;
-        msSuspected.setScoreHistory(scoreHistroy);
-        msSuspected.setScoreRezult(scoreRezulte(msSuspected.getScoreHistory(), msSuspected.getScore()));
+        msSuspected.setScoreHistroy(scoreHistroy);
+        msSuspected.setScoreRezult(scoreRezulte(msSuspected.getScoreHistroy(), msSuspected.getScore()));
         return msSuspected;
     }