xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -93,6 +93,7 @@
                         <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 2vw;width: 30%;">
                             <button id="ribao_score"  style="height:5vh;" class="weui-btn weui-btn_mini weui-btn_primary">健康评估</button></div>
                             <input id="js_input_score_rezult" class="weui-input" autofocus=""  readonly="readonly" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+                             <input id="js_input_score_rezult_value" type="text" hidden="hidden" />
                              <input id="js_input_temperature_score" type="text" hidden="hidden" />
                              <input id="js_input_score_histroy" type="text" hidden="hidden" />
                               <input id="js_input_score" type="text" hidden="hidden"/>

whepi-ui/templates/home/ribao.js

@@ -404,7 +404,7 @@ function ribaoCommit() {
   var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
   var others = $("#shuruqita").val() == undefined ? "" : $("#shuruqita").val();
-  var scoreRezult = $("#js_input_score_rezult").val() == undefined ? "" : $("#js_input_score_rezult").val();
+  var scoreRezult = $("#js_input_score_rezult_value").val() == undefined ? "" : $("#js_input_score_rezult_value").val();
   var temperatureScore = $("#js_input_temperature_score").val() == undefined ? "" : $("#js_input_temperature_score").val();
   var scoreHistroy = $("#js_input_score_histroy").val() == undefined ? "" : $("#js_input_score_histroy").val();
   var score = $("#js_input_score").val() == undefined ? "" : $("#js_input_score").val();
@@ -547,6 +547,11 @@ function updateSuspected(suspectedId) {
         $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
 
         $("#shuruqita").val(suspected.others);
+        $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult));
+        $("#js_input_score_rezult_value").val(suspected.scoreRezult);
+        $("#js_input_temperature_score").val(suspected.temperatureScore);
+        $("#js_input_score_histroy").val(suspected.scoreHistroy);
+        $("#js_input_score").val(suspected.score);
       }
     },
   });
@@ -791,6 +796,11 @@ function clearShow() {
   $("#js_input_user_fuxie").attr("data-values", "");
 
   $("#shuruqita").val("");
+  $("#js_input_score_rezult").val("");
+  $("#js_input_score_rezult_value").val("");
+  $("#js_input_temperature_score").val("");
+  $("#js_input_score_histroy").val("");
+  $("#js_input_score").val("");
 }
 
 //健康评估
@@ -834,11 +844,19 @@ $('#ribao_score').on('click', function () {
     success: function (data) {
       if (data == undefined) {
         $('#js_input_score_rezult').empty();
+        $('#js_input_score_rezult_value').empty();
+        $('#js_input_temperature_score').empty();
+        $('#js_input_score_histroy').empty();
+        $('#js_input_score').empty();
       }
       else {
         $('#js_input_score_rezult').empty();
+        $('#js_input_temperature_score').empty();
+        $('#js_input_score_histroy').empty();
+        $('#js_input_score').empty();
         var ScoreRezult = getScoreRezult(data.scoreRezult);
         $("#js_input_score_rezult").val(ScoreRezult);
+        $("#js_input_score_rezult_value").val(data.scoreRezult);
         $("#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/dao/MsSuspectedMapper.java

@@ -26,6 +26,6 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
     Integer selectUserNameNum(@Param("reportId") Long reportId, @Param("userName") String userName);
 
     //判断家人是否有历史评分
-    @Select("select score from ms_suspected where user_create=#{userCreate} and user_name=#{userName} order by time_update desc limit 1")
-    Integer selectUserNameScore(@Param("userCreate") Long userCreate, @Param("userName") String userName);
+    @Select("select score from ms_suspected where user_create=#{userCreate} and user_name=#{userName} and suspected_id !=#{suspectedId}  order by time_update desc limit 1")
+    Integer selectUserNameScore(@Param("userCreate") Long userCreate, @Param("userName") String userName, @Param("suspectedId") Long suspectedId);
 }

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

@@ -214,11 +214,11 @@ public class MsSuspectedService {
 
     //健康评估
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public MsSuspected getScore(String userName, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea, Long userCreate) {
+    public MsSuspected getScore(Long susprectedId,String userName, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea, Long userCreate) {
         MsSuspected msSuspected = new MsSuspected();
         msSuspected.setTemperatureScore(getTemperatureScore(temperature));
         msSuspected.setScore(addScore(temperature, cough, muscle, dyspnea, fatigue, diarrhea));
-        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName);
+        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName,susprectedId);
         if (scoreHistroy == null)
             scoreHistroy = 0;
         msSuspected.setScoreHistroy(scoreHistroy);

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

@@ -127,6 +127,7 @@ public class MsReportController {
     //健康评估
     @PostMapping("/home/addScore")
     public MsSuspected addScore(HttpServletRequest request) {
+        Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
         String userName = request.getParameter("userName");
         Long userCreate = Conv.NL(request.getParameter("userCreate"));
         BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
@@ -135,7 +136,7 @@ public class MsReportController {
         Integer dyspnea = Conv.NI(request.getParameter("dyspnea"));
         Integer fatigue = Conv.NI(request.getParameter("fatigue"));
         Integer diarrhea = Conv.NI(request.getParameter("diarrhea"));
-        return msSuspectedService.getScore(userName,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+        return msSuspectedService.getScore(suspectedId,userName,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
     }
 
 }