xielianghe

whepi-ui/templates/home/ribao.js

@@ -321,38 +321,122 @@ function ribao_add() {
       $('#ribao')[0].style.display = 'none';
     }
 
+    var userId = $("#userId").val();
+    //获取用户家人
+    $.ajax({
+      url: '/home/selectAddSuspected',
+      get: "get",
+      data: {
+        "userCreate": userId
+      },
+      success: function (data) {
+        if (data != null || data!='') {
+          //存在
+          var suspected = data;
+          $("#js_input_user_sex").val(getGreder(suspected.grender));
+          $("#js_input_user_sex").attr("data-values", suspected.grender);
+          $("#js_input_user_name").val(suspected.userName);
+          $("#js_input_user_age").val(suspected.age);
+          //基本情况
+          if (suspected.familyStatus != "") {
+            var familyStatusList = suspected.familyStatus.split(",");
+            if (familyStatusList[0] == 1)
+              $("input[name='checkbox1']").prop("checked", "checked");
+            else
+              $("input[name='checkbox1']").removeAttr("checked");
+            if (familyStatusList[1] == 1)
+              $("input[name='checkbox2']").prop("checked", "checked");
+            else
+              $("input[name='checkbox2']").removeAttr("checked");
+            if (familyStatusList[2] == 1)
+              $("input[name='checkbox3']").prop("checked", "checked");
+            else
+              $("input[name='checkbox3']").removeAttr("checked");
+            if (familyStatusList[3] == 1)
+              $("input[name='checkbox4']").prop("checked", "checked");
+            else
+              $("input[name='checkbox4']").removeAttr("checked");
+            if (familyStatusList[4] == 1)
+              $("input[name='checkbox5']").prop("checked", "checked");
+            else
+              $("input[name='checkbox5']").removeAttr("checked");
+            if (familyStatusList[5] == 1)
+              $("input[name='checkbox6']").prop("checked", "checked");
+            else
+              $("input[name='checkbox6']").removeAttr("checked");
+            if (familyStatusList[6] == 1)
+              $("input[name='checkbox7']").prop("checked", "checked");
+            else
+              $("input[name='checkbox7']").removeAttr("checked");
 
-    //基本情况
-    $("input[name='checkbox1']").removeAttr("checked");
-    $("input[name='checkbox2']").removeAttr("checked");
-    $("input[name='checkbox3']").removeAttr("checked");
-    $("input[name='checkbox4']").removeAttr("checked");
-    $("input[name='checkbox5']").removeAttr("checked");
-    $("input[name='checkbox6']").removeAttr("checked");
-    $("input[name='checkbox7']").removeAttr("checked");
+          }
 
-    $("#switchQuezhen").val(getMedical(0));
-    $("#switchQuezhen").attr("data-values", 0);
+          $("#switchQuezhen").val(getMedical(suspected.medical));
+          $("#switchQuezhen").attr("data-values", suspected.medical);
 
-    $("#switchDanjiangeli").val(getSingleRoom(0));
-    $("#switchDanjiangeli").attr("data-values", 0);
+          $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
+          $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
 
-    $("#js_input_user_tiwen").val(0);
+          $("#js_input_user_tiwen").val(suspected.temperature);
 
-    $("#js_input_user_kesou").val(getCough(0));
-    $("#js_input_user_kesou").attr("data-values", 0);
+          $("#js_input_user_kesou").val(getCough(suspected.cough));
+          $("#js_input_user_kesou").attr("data-values", suspected.cough);
 
-    $("#js_input_user_jirou").val(getMuscle(0));
-    $("#js_input_user_jirou").attr("data-values", 0);
+          $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
+          $("#js_input_user_jirou").attr("data-values", suspected.muscle);
 
-    $("#js_input_user_huxi").val(getDyspnea(0));
-    $("#js_input_user_huxi").attr("data-values", 0);
+          $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
+          $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
+
+          $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
+          $("#js_input_user_fali").attr("data-values", suspected.fatigue);
+
+          $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
+          $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
+
+          $("#shuruqita").val(suspected.others);
+          $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult, suspected.temperatureScore));
+          $("#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);
+        }
+        else {
+          //基本情况
+          $("input[name='checkbox1']").removeAttr("checked");
+          $("input[name='checkbox2']").removeAttr("checked");
+          $("input[name='checkbox3']").removeAttr("checked");
+          $("input[name='checkbox4']").removeAttr("checked");
+          $("input[name='checkbox5']").removeAttr("checked");
+          $("input[name='checkbox6']").removeAttr("checked");
+          $("input[name='checkbox7']").removeAttr("checked");
 
-    $("#js_input_user_fali").val(getFatigue(0));
-    $("#js_input_user_fali").attr("data-values", 0);
+          $("#switchQuezhen").val(getMedical(0));
+          $("#switchQuezhen").attr("data-values", 0);
 
-    $("#js_input_user_fuxie").val(getDiarrhea(0));
-    $("#js_input_user_fuxie").attr("data-values", 0);
+          $("#switchDanjiangeli").val(getSingleRoom(0));
+          $("#switchDanjiangeli").attr("data-values", 0);
+
+          $("#js_input_user_tiwen").val(0);
+
+          $("#js_input_user_kesou").val(getCough(0));
+          $("#js_input_user_kesou").attr("data-values", 0);
+
+          $("#js_input_user_jirou").val(getMuscle(0));
+          $("#js_input_user_jirou").attr("data-values", 0);
+
+          $("#js_input_user_huxi").val(getDyspnea(0));
+          $("#js_input_user_huxi").attr("data-values", 0);
+
+          $("#js_input_user_fali").val(getFatigue(0));
+          $("#js_input_user_fali").attr("data-values", 0);
+
+          $("#js_input_user_fuxie").val(getDiarrhea(0));
+          $("#js_input_user_fuxie").attr("data-values", 0);
+
+        }
+      },
+    });
 
   });
 }

whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -28,4 +28,14 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
     //判断家人是否有历史评分
     @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);
+
+
+    //判断家人是否有历史评分
+    @Select("select a.* \n" +
+            "from ms_suspected a \n" +
+            "INNER JOIN ms_report b on a.report_id=b.report_id \n" +
+            "where b.user_create=#{userCreate} and b.report_date=(select report_date from ms_report where user_create=#{userCreate} and report_date<curdate() ORDER BY report_date desc LIMIT 1)\n" +
+            "and a.user_name not in (select a.user_name from ms_suspected a INNER JOIN ms_report b on a.report_id=b.report_id where b.user_create=#{userCreate} and b.report_date=curdate())\n" +
+            " ORDER by a.time_create  LIMIT 1")
+    MsSuspected selectAddSuspected(@Param("userCreate") Long userCreate);
 }

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

@@ -38,6 +38,11 @@ public class MsSuspectedService {
     public MsSuspected selectSuspected(long suspectedId) {
         return msSuspectedMapper.selectById(suspectedId);
     }
+    //查询用户最近一天的一个家人
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public MsSuspected selectAddSuspected(Long userCreate) {
+        return msSuspectedMapper.selectAddSuspected(userCreate);
+    }
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)

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

@@ -61,15 +61,22 @@ public class MsReportController {
         Integer scoreHistroy = Conv.NI(request.getParameter("scoreHistroy"));
         Integer score = Conv.NI(request.getParameter("score"));
 
-        MsReport msReport=new MsReport();
-        Long reportId =msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate,scoreRezult,temperatureScore,scoreHistroy,score);
-        if(reportId==2L)
+        MsReport msReport = new MsReport();
+        Long reportId = msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score);
+        if (reportId == 2L)
             msReport.setMsgReport("2");
         else
-            msReport= msReportService.getByReport(reportId);
+            msReport = msReportService.getByReport(reportId);
         return msReport;
     }
 
+    //查询用户最近一天的一个家人
+    @GetMapping("/home/selectAddSuspected")
+    public MsSuspected selectAddSuspected(HttpServletRequest request) {
+        Long userCreate = Long.parseLong(request.getParameter("userCreate"));
+        return msSuspectedService.selectAddSuspected(userCreate);
+    }
+
     //查询家人
     @GetMapping("/home/selectSuspected")
     public MsSuspected selectSuspected(HttpServletRequest request) {
@@ -114,7 +121,7 @@ public class MsReportController {
             return ModelOps.newSuccess();
         } else if (re == 2) { //没有上报体温
             return ModelOps.newFail("请填报今日体温！");
-        }else if (re == 3) { //没有选择家人
+        } else if (re == 3) { //没有选择家人
             return ModelOps.newFail("请选择家人！");
         }
         return ModelOps.newFail("上报错误");
@@ -147,7 +154,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(suspectedId,userName,medical,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+        return msSuspectedService.getScore(suspectedId, userName, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
     }
 
 }