Merge remote-tracking branch 'remotes/origin/test_branch'

whepi-ui/templates/home/home.ftl

@@ -58,14 +58,8 @@
         var uptownId = $("#uptownId").val();
         if (uptownId == '1238790987234'){
             $('#ribao_trip')[0].style.display = 'none';
-            $('#ribao_dnjgl')[0].style.display = 'none';
-            $('#ribao_qz')[0].style.display = 'none';
-            $('#ribao_zz')[0].style.display = '';
         }else{
             $('#ribao_trip')[0].style.display = '';
-            $('#ribao_dnjgl')[0].style.display = '';
-            $('#ribao_qz')[0].style.display = '';
-            $('#ribao_zz')[0].style.display = 'none';
         }
         ribao_init();
         qiuzhu_init();

whepi-ui/templates/home/ribao.ftl

@@ -41,7 +41,8 @@
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
                     <div class="weui-btn-area">
-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" style=""
+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                           style=""
                            onclick="addReport()">上报</a>
                     </div>
                 </div>
@@ -128,32 +129,18 @@
                 <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
-                    <div id="ribao_qz">
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">确诊新冠肺炎</div>
-                            <input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"
-                                   maxlength="20"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                        </div>
-                    </div>
-                    <div id="ribao_zz">
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">今日症状</div>
-                            <input id="switchQuezhen_zz" class="weui-input" autofocus="" type="text" placeholder="请选择"
-                                   maxlength="20"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                        </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">新冠肺炎</div>
+                        <input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"
+                               maxlength="20"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
                     </div>
-                    <div id="ribao_dnjgl">
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>
-                            <input id="switchDanjiangeli" class="weui-input" autofocus="" type="text" placeholder="请选择"
-                                   maxlength="20"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                        </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>
+                        <input id="switchDanjiangeli" class="weui-input" autofocus="" type="text" placeholder="请选择"
+                               maxlength="20"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
                     </div>
-
-
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">体温</div>
                         <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number" placeholder="请输入"
@@ -212,21 +199,26 @@
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
                             <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
                             <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput1(this)"/>
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                   onchange="selectinput1(this)"/>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <input id="js_input_qtdd" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                            <input id="js_input_qtdd" placeholder="其它地点" disabled="disabled" type="text"
+                                   style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                             <div style="height: 5vh; line-height: 5vh; width: 55%;">今日所在地</div>
                             <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput2(this)"/>
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                   onchange="selectinput2(this)"/>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <input id="js_input_jrszq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                            <input id="js_input_jrszq" placeholder="其它地点" disabled="disabled" type="text"
+                                   style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                             <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</div>
                             <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%" onchange="selectinput6(this)"/>
+                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%"
+                                   onchange="selectinput6(this)"/>
                         </div>
                         <br/>
                     <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
@@ -238,23 +230,29 @@
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
                                 <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
                                 <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput3(this)"/>
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                       onchange="selectinput3(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_cfdq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                                <input id="js_input_cfdq" placeholder="其它地点" disabled="disabled" type="text"
+                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                                 <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
                                 <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput4(this)"/>
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                       onchange="selectinput4(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_mddq" placeholder="其它地点" disabled="disabled" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                                <input id="js_input_mddq" placeholder="其它地点" disabled="disabled" type="text"
+                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                                 <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
                                 <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput5(this)"/>
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                       onchange="selectinput5(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                                <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text"
+                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
 
                             </div>
                             <div class="weui-cell__ft" style="margin-top: 1vh;">
@@ -316,9 +314,11 @@
             </div>
             <div id="rb_nav3" class="weui-tab__bd-item ">
                 <div class="weui-panel weui-panel_access">
-<#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
-                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
-                    <div class="weui-panel__hd" style=" font-size: large"><span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
+                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
+                    <div class="weui-panel__hd" style=" font-size: large"><span
+                            id="unitMsg">${ridgepole!''}${unit!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
                     <div class="weui-cell weui-cell_select weui-cell_select-after">
                         <div class="weui-cell__hd">

whepi-ui/templates/home/ribao.js

@@ -285,27 +285,27 @@ function ribao_init() {
       }]
   });
 
+  // $("#switchQuezhen").select({
+  //   title: "选择是否确诊",
+  //   items: [
+  //     {
+  //       title: "否",
+  //       value: "0",
+  //     },
+  //     {
+  //       title: "是",
+  //       value: "1",
+  //     }]
+  // });
+
   $("#switchQuezhen").select({
-    title: "选择是否确诊",
+    title: "选择症状",
     items: [
       {
-        title: "否",
+        title: "无",
         value: "0",
       },
       {
-        title: "是",
-        value: "1",
-      }]
-  });
-
-  $("#switchQuezhen_zz").select({
-    title: "选择症状",
-    items: [
-        {
-            title: "无",
-            value: "0",
-        },
-      {
         title: "新冠确诊",
         value: "1",
       },
@@ -419,12 +419,12 @@ function selectinput6(obj) {
   var grender = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (grender == 0) {
     $('#none')[0].style.display = 'none';
-      $("#js_input_cfd").val("");
-      $("#js_input_cfd").attr("data-values", "");
-      $("#js_input_mdd").val("");
-      $("#js_input_mdd").attr("data-values", "");
-      $("#js_input_cxfs").val("");
-      $("#js_input_cxfs").attr("data-values", "");
+    $("#js_input_cfd").val("");
+    $("#js_input_cfd").attr("data-values", "");
+    $("#js_input_mdd").val("");
+    $("#js_input_mdd").attr("data-values", "");
+    $("#js_input_cxfs").val("");
+    $("#js_input_cxfs").attr("data-values", "");
     $('#js_input_cxfsq').val("");
     $('#js_input_cfdq').val("");
     $('#js_input_mddq').val("");
@@ -590,11 +590,13 @@ function splice(obj) {
 //近日报告
 function ribaoInitialization(reportId) {
   if (reportId == null)
-    return;
+    reportId = 0;
+  var userId = $("#userId").val();
   $.ajax({
     url: '/home/home/queryRibaoRefresh',
     data: {
-      reportId: reportId
+      reportId: reportId,
+      userCreate: userId
     },
     type: 'GET',
     success: function (data) {
@@ -651,7 +653,7 @@ function ribao_cell(v) {
     familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
-    medical = "是否确诊：" + getMedical(v.medical) + "；";
+    medical = "新冠肺炎：" + getMedical(v.medical) + "；";
   var singleRoom = "";
   if (v.singleRoom != 0)
     singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
@@ -722,151 +724,195 @@ function ribao_add() {
       $('#notOpenRibao')[0].style.display = '';
       $('#ribao')[0].style.display = 'none';
     }
+    //基本情况
+    $("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");
 
-    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");
-
-          }
-
-          $("#switchQuezhen").val(getMedical(suspected.medical));
-          $("#switchQuezhen").attr("data-values", suspected.medical);
+    $("#switchQuezhen").val(getMedical(0));
+    $("#switchQuezhen").attr("data-values", 0);
 
-          $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
-          $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
+    $("#switchDanjiangeli").val(getSingleRoom(0));
+    $("#switchDanjiangeli").attr("data-values", 0);
 
-          $("#js_input_user_tiwen").val(suspected.temperature);
+    $("#js_input_user_tiwen").val(0);
 
-          $("#js_input_user_kesou").val(getCough(suspected.cough));
-          $("#js_input_user_kesou").attr("data-values", suspected.cough);
+    $("#js_input_user_kesou").val(getCough(0));
+    $("#js_input_user_kesou").attr("data-values", 0);
 
-          $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
-          $("#js_input_user_jirou").attr("data-values", suspected.muscle);
+    $("#js_input_user_jirou").val(getMuscle(0));
+    $("#js_input_user_jirou").attr("data-values", 0);
 
-          $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
-          $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
+    $("#js_input_user_huxi").val(getDyspnea(0));
+    $("#js_input_user_huxi").attr("data-values", 0);
 
-          $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
-          $("#js_input_user_fali").attr("data-values", suspected.fatigue);
+    $("#js_input_user_fali").val(getFatigue(0));
+    $("#js_input_user_fali").attr("data-values", 0);
 
-          $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
-          $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
+    $("#js_input_user_fuxie").val(getDiarrhea(0));
+    $("#js_input_user_fuxie").attr("data-values", 0);
 
-          $("#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);
 
-          $("#js_input_sf").val(getIsTrip(0));
-          $("#js_input_sf").attr("data-values", 0);
-          $('#none')[0].style.display = 'none';
-        }
-        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");
-
-          $("#switchQuezhen").val(getMedical(0));
-          $("#switchQuezhen").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);
-
-
-          // $("#js_input_cxfs").empty();
-          // $("#js_input_cfd").empty();
-          // $("#js_input_mdd").empty();
-          // $('#js_input_cxfsq').val("");
-          // $('#js_input_cfdq').val("");
-          // $('#js_input_mddq').val("");
-          // listcx.splice(0,listcx.length);
-          // $('#tabtr').empty();
-          // $("#js_input_qtdd").val("");
-          // $("#js_input_jrszq").val("");
-          // $("#js_input_sf").val("");
-          $("#js_input_sf").val(getIsTrip(0));
-          $("#js_input_sf").attr("data-values", 0);
-          $('#none')[0].style.display = 'none';
-          $('#tabtr').empty();
-          // $("#suspectedId").val("");
-          // $("#js_input_gzzd").val("");
-          // $("#js_input_jrszd").val("");
-          // $('#js_input_mddq').attr("disabled","disabled");
-          // $('#js_input_jrszq').attr("disabled","disabled");
-          // $('#js_input_qtdd').attr("disabled","disabled");
-          // $('#js_input_cfdq').attr("disabled","disabled");
-
-        }
-      },
-    });
+    $("#js_input_sf").val(getIsTrip(0));
+    $("#js_input_sf").attr("data-values", 0);
+    $('#none')[0].style.display = 'none';
+    $('#tabtr').empty();
+    // $("#suspectedId").val("");
+    // $("#js_input_gzzd").val("");
+    // $("#js_input_jrszd").val("");
+    // $('#js_input_mddq').attr("disabled","disabled");
+    // $('#js_input_jrszq').attr("disabled","disabled");
+    // $('#js_input_qtdd').attr("disabled","disabled");
+    // $('#js_input_cfdq').attr("disabled","disabled");
+
+    // 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");
+    //
+    //       }
+    //
+    //       $("#switchQuezhen").val(getMedical(suspected.medical));
+    //       $("#switchQuezhen").attr("data-values", suspected.medical);
+    //
+    //       $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
+    //       $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
+    //
+    //       $("#js_input_user_tiwen").val(suspected.temperature);
+    //
+    //       $("#js_input_user_kesou").val(getCough(suspected.cough));
+    //       $("#js_input_user_kesou").attr("data-values", suspected.cough);
+    //
+    //       $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
+    //       $("#js_input_user_jirou").attr("data-values", suspected.muscle);
+    //
+    //       $("#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);
+    //
+    //       $("#js_input_sf").val(getIsTrip(0));
+    //       $("#js_input_sf").attr("data-values", 0);
+    //       $('#none')[0].style.display = 'none';
+    //     }
+    //     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");
+    //
+    //       $("#switchQuezhen").val(getMedical(0));
+    //       $("#switchQuezhen").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);
+    //
+    //
+    //       // $("#js_input_cxfs").empty();
+    //       // $("#js_input_cfd").empty();
+    //       // $("#js_input_mdd").empty();
+    //       // $('#js_input_cxfsq').val("");
+    //       // $('#js_input_cfdq').val("");
+    //       // $('#js_input_mddq').val("");
+    //       // listcx.splice(0,listcx.length);
+    //       // $('#tabtr').empty();
+    //       // $("#js_input_qtdd").val("");
+    //       // $("#js_input_jrszq").val("");
+    //       // $("#js_input_sf").val("");
+    //       $("#js_input_sf").val(getIsTrip(0));
+    //       $("#js_input_sf").attr("data-values", 0);
+    //       $('#none')[0].style.display = 'none';
+    //       $('#tabtr').empty();
+    //       // $("#suspectedId").val("");
+    //       // $("#js_input_gzzd").val("");
+    //       // $("#js_input_jrszd").val("");
+    //       // $('#js_input_mddq').attr("disabled","disabled");
+    //       // $('#js_input_jrszq').attr("disabled","disabled");
+    //       // $('#js_input_qtdd').attr("disabled","disabled");
+    //       // $('#js_input_cfdq').attr("disabled","disabled");
+    //
+    //     }
+    //   },
+    // });
 
   });
 }
@@ -874,25 +920,25 @@ function ribao_add() {
 function ribao_cancel() {
   $('#cancel').on('click', function () {
 
-      listcx.splice(0, listcx.length);
-      $('#tabtr').empty();
-      $("#js_input_cfd").val("");
-      $("#js_input_cfd").attr("data-values", "");
-      $("#js_input_mdd").val("");
-      $("#js_input_mdd").attr("data-values", "");
-      $("#js_input_cxfs").val("");
-      $("#js_input_cxfs").attr("data-values", "");
-      $("#js_input_gzzd").val("");
-      $("#js_input_gzzd").attr("data-values", "");
-      $("#js_input_jrszd").val("");
-      $("#js_input_jrszd").attr("data-values", "");
-      $("#js_input_sf").val("");
-      $("#js_input_sf").attr("data-values", "");
-      $("#js_input_qtdd").val("");
-      $("#js_input_jrszq").val("");
-      $("#js_input_cfdq").val("");
-      $("#js_input_mddq").val("");
-      $("#js_input_cxfsq").val("");
+    listcx.splice(0, listcx.length);
+    $('#tabtr').empty();
+    $("#js_input_cfd").val("");
+    $("#js_input_cfd").attr("data-values", "");
+    $("#js_input_mdd").val("");
+    $("#js_input_mdd").attr("data-values", "");
+    $("#js_input_cxfs").val("");
+    $("#js_input_cxfs").attr("data-values", "");
+    $("#js_input_gzzd").val("");
+    $("#js_input_gzzd").attr("data-values", "");
+    $("#js_input_jrszd").val("");
+    $("#js_input_jrszd").attr("data-values", "");
+    $("#js_input_sf").val("");
+    $("#js_input_sf").attr("data-values", "");
+    $("#js_input_qtdd").val("");
+    $("#js_input_jrszq").val("");
+    $("#js_input_cfdq").val("");
+    $("#js_input_mddq").val("");
+    $("#js_input_cxfsq").val("");
 
 
     if ($('#ribao')[0].style.display == 'none') {
@@ -907,11 +953,11 @@ function ribao_cancel() {
 }
 
 function ribaoCommit() {
-    var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
-    if(listcx.length == 0 && sf == 1){
-        $.alert("请添加出行");
-        return;
-    }
+  var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+  if (listcx.length == 0 && sf == 1) {
+    $.alert("请添加出行");
+    return;
+  }
   var suspectedId = $("#suspectedId").val();
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
@@ -1357,7 +1403,7 @@ function helpValue1(v) {
     familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
-    medical = "是否确诊：" + getMedical(v.medical) + "；";
+    medical = "新冠肺炎：" + getMedical(v.medical) + "；";
   var singleRoom = "";
   if (v.singleRoom != 0)
     singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
@@ -1502,12 +1548,19 @@ function getFatigue(fatigue) {
 
 function getMedical(medical) {
   if (medical == 0)
-    return "否";
+    return "无";
   else if (medical == 1)
-    return "是";
+    return "新冠确诊";
+  else if (medical == 2)
+    return "新冠疑似";
+  else if (medical == 3)
+    return "密切接触者";
+  else if (medical == 4)
+    return "解除观察";
   return "";
 }
 
+
 function getSingleRoom(singleRoom) {
   if (singleRoom == 0)
     return "否";
@@ -1623,6 +1676,17 @@ function clearShow() {
   $("#js_input_temperature_score").val("");
   $("#js_input_score_histroy").val("");
   $("#js_input_score").val("");
+
+  //出行
+  $("#js_input_gzzd").val("");
+  $("#js_input_gzzd").attr("data-values", "");
+  $("#js_input_qtdd").val("");
+  $("#js_input_jrszd").val("");
+  $("#js_input_jrszd").attr("data-values", "");
+  $("#js_input_jrszq").val("");
+  $("#js_input_sf").val(getIsTrip(0));
+  $("#js_input_sf").attr("data-values", 0);
+  $('#none')[0].style.display = 'none';
 }
 
 //健康评估

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

@@ -40,6 +40,15 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
             " ORDER by a.time_create  LIMIT 1")
     MsSuspected selectAddSuspected(@Param("userCreate") Long userCreate);
 
+    //获取最近的一个人一个家人
+    @Select("select a.*,c.* \n" +
+            "from ms_suspected a \n" +
+            "INNER JOIN ms_report b on a.report_id=b.report_id \n" +
+            "left JOIN ms_trip c on a.suspected_id=c.trip_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" +
+            "ORDER by a.time_create ")
+    List<MsSuspected> selectNextSuspected(@Param("userCreate") Long userCreate);
+
     //选择家人
     @Select("select a.*,b.* from ms_suspected a LEFT JOIN ms_trip b on a.suspected_id=b.trip_id where a.suspected_id =#{suspectedId}")
     MsSuspected selectBySuspectedId(@Param("suspectedId") Long suspectedId);

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

@@ -4,10 +4,9 @@ package com.bofeng.service;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
-import com.bofeng.entity.MsReport;
-import com.bofeng.entity.MsSuspected;
-import com.bofeng.entity.MsTripDet;
-import com.bofeng.entity.UserOpen;
+import com.bofeng.dao.MsTripDetMapper;
+import com.bofeng.dao.MsTripMapper;
+import com.bofeng.entity.*;
 import org.apache.commons.lang3.tuple.Triple;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,20 +35,22 @@ public class MsReportService {
     @Autowired
     private MsReportService msReportService;
     @Autowired
-    private MsSuspectedService msSuspectedService;
+    private MsTripDetMapper msTripDetMapper;
+    @Autowired
+    private MsTripMapper msTripMapper;
 
     public List<MsSuspected> getByReportId(Long reportId) {
         List<MsSuspected> listSuspected = null;
-        listSuspected=msSuspectedMapper.selectByReportId(reportId);
+        listSuspected = msSuspectedMapper.selectByReportId(reportId);
         if (listSuspected != null && listSuspected.size() > 0) {
             String tripDet;
             for (MsSuspected msSuspected : listSuspected) {
-                tripDet="";
+                tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(msSuspected.getSuspectedId());
                 if (listDet != null && listDet.size() > 0) {
                     for (MsTripDet msTripDet : listDet) {
-                        tripDet += "出发地：" + getLocalOther(msTripDet.getStartLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "出发地：" + getLocalOther(msTripDet.getStartLocal(), msTripDet.getStartLocalOther()) + ",";
                         tripDet += "目的地：" + getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
                         tripDet += "出行方式：" + getTripType(msTripDet.getTripType()) + ",";
                         tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
@@ -59,7 +60,7 @@ public class MsReportService {
             }
 
         }
-        return listSuspected ;
+        return listSuspected;
     }
 
     public MsReport getByReport(Long reportId) {
@@ -75,12 +76,12 @@ public class MsReportService {
             if (listSuspected != null && listSuspected.size() > 0) {
                 String tripDet;
                 for (MsSuspected msSuspected : listSuspected) {
-                    tripDet="";
+                    tripDet = "";
                     //出行详细
                     List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(msSuspected.getSuspectedId());
                     if (listDet != null && listDet.size() > 0) {
                         for (MsTripDet msTripDet : listDet) {
-                            tripDet += "出发地：" + getLocalOther(msTripDet.getStartLocal(), msTripDet.getEndLocalOther()) + ",";
+                            tripDet += "出发地：" + getLocalOther(msTripDet.getStartLocal(), msTripDet.getStartLocalOther()) + ",";
                             tripDet += "目的地：" + getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
                             tripDet += "出行方式：" + getTripType(msTripDet.getTripType()) + ",";
                             tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
@@ -123,7 +124,7 @@ public class MsReportService {
     //获取今天数据
     public MsReport getReportByDateNow(Long userCreate) {
         //根据昨天的获取今天的
-        // msReportService.getNowByYesterday(userCreate);
+        //msReportService.getNowByYesterday(userCreate);
         //msReportService.getNowByYesterdayDate();
         //msReportService.addReport250();
         Date t = new Date();
@@ -131,7 +132,17 @@ public class MsReportService {
         String reportDate = df.format(t);
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
         MsReport msReport = new MsReport();
-        if (listReport != null && listReport.size() > 0) {
+        //今天不存在
+        if (listReport == null || listReport.size() == 0) {
+            //最近一天数据复制到今天
+            msReportService.getNowByNextDat(userCreate);
+            List<MsReport> listReport1 = msReportMapper.selectByReportDate(reportDate, userCreate);
+            //今天不存在
+            if (listReport1 != null && listReport1.size() > 0)
+                msReport = msReportMapper.selectById(Long.parseLong(listReport1.get(0).getReportId().toString()));
+        }
+        else {
+
             msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         }
         return msReport;
@@ -363,4 +374,112 @@ public class MsReportService {
         }
     }
 
+
+    //通过最近一天数据更新今天数据
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void getNowByNextDat(Long userCreate) {
+
+        SimpleDateFormat sj = new SimpleDateFormat("yyyy-MM-dd");
+        Date d = new Date();
+
+        //判断今天是否有数据
+        String DateNow = sj.format(d);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(DateNow, userCreate);
+        if (listReport != null && listReport.size() > 0)
+            return;
+
+        //判断最近一天是否有数据
+        List<MsSuspected> listSuspected = msSuspectedMapper.selectNextSuspected(userCreate);
+        //有数据
+        if (listSuspected != null && listSuspected.size() > 0) {
+            //添加到今天日报
+            MsReport msReport = msReportMapper.selectById(Long.parseLong(listSuspected.get(0).getReportId().toString()));
+            Long reportId = 0L;
+            if (msReport != null) {
+                MsReport msReport1 = new MsReport();
+                msReport1.setReportId(IdWorker.getId());
+                msReport1.setHouseId(msReport.getHouseId());
+                msReport1.setSafetyNum(msReport.getSafetyNum());
+                msReport1.setSureNum(msReport.getSureNum());
+                msReport1.setSuspectedNum(msReport.getSuspectedNum());
+                msReport1.setNormalNum(msReport.getNormalNum());
+                msReport1.setSingleNum(msReport.getSingleNum());
+                msReport1.setRemarks(msReport.getRemarks());
+                msReport1.setReportDate(DateTime.now().toDate());
+                msReport1.setReportStatus(0);//未上报
+                msReport1.setMsStatus(msReport.getMsStatus());
+                msReport1.setUserCreate(userCreate);
+                msReport1.setTimeCreate(DateTime.now());
+                msReport1.setUserUpdate(userCreate);
+                msReport1.setTimeUpdate(DateTime.now());
+                msReportMapper.insert(msReport1);
+                reportId = msReport1.getReportId();
+            }
+            //添加今日家人
+            for (MsSuspected msSuspected : listSuspected) {
+                MsSuspected msSuspected1 = new MsSuspected();
+                msSuspected1.setSuspectedId(IdWorker.getId());
+                msSuspected1.setReportId(reportId);
+                msSuspected1.setUserName(msSuspected.getUserName());
+                msSuspected1.setGrender(msSuspected.getGrender());
+                msSuspected1.setAge(msSuspected.getAge());
+                msSuspected1.setFamilyStatus(msSuspected.getFamilyStatus());
+                msSuspected1.setStatusDesp(msSuspected.getStatusDesp());
+                msSuspected1.setMedical(msSuspected.getMedical());
+                msSuspected1.setTemperature(new BigDecimal(0));
+                msSuspected1.setCough(msSuspected.getCough());
+                msSuspected1.setMuscle(msSuspected.getMuscle());
+                msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
+                msSuspected1.setFatigue(msSuspected.getFatigue());
+                msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
+                msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
+                msSuspected1.setOthers(msSuspected.getOthers());
+                // msSuspected1.setScoreRezult(msSuspected.getScoreRezult());
+                // msSuspected1.setScore(msSuspected.getScore());
+                // msSuspected1.setScoreHistroy(msSuspected.getScoreHistroy());
+                // msSuspected1.setTemperatureScore(msSuspected.getTemperatureScore());
+                msSuspected1.setSuspectedStatus(0);
+                msSuspected1.setUserCreate(userCreate);
+                msSuspected1.setTimeCreate(DateTime.now());
+                msSuspected1.setUserUpdate(userCreate);
+                msSuspected1.setTimeUpdate(DateTime.now());
+                msSuspectedMapper.insert(msSuspected1);
+
+                //添加行程
+                MsTrip msTrip = new MsTrip();
+                msTrip.setTripId(msSuspected1.getSuspectedId());
+                msTrip.setIsTrip(msSuspected.getIsTrip());
+                msTrip.setTodayLocal(msSuspected.getTodayLocal());
+                msTrip.setTodayLocalOther(msSuspected.getTodayLocalOther());
+                msTrip.setWorkLocal(msSuspected.getWorkLocal());
+                msTrip.setWorkLocalOther(msSuspected.getWorkLocalOther());
+                msTripMapper.insert(msTrip);
+
+                //添加出行详细
+                List<MsTripDet> listTripDet = msSuspectedMapper.selectTripSuspected(msSuspected.getSuspectedId());
+                if (listTripDet != null && listTripDet.size() > 0) {
+                    for (MsTripDet msTripDet : listTripDet) {
+                        MsTripDet msTripDet1 = new MsTripDet();
+                        msTripDet1.setTripDetId(IdWorker.getId());
+                        msTripDet1.setTripId(msSuspected1.getSuspectedId());
+                        msTripDet1.setSort(msTripDet.getSort());
+                        msTripDet1.setStartLocal(msTripDet.getStartLocal());
+                        msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());
+                        msTripDet1.setEndLocal(msTripDet.getEndLocal());
+                        msTripDet1.setEndLocalOther(msTripDet.getEndLocalOther());
+                        msTripDet1.setTripType(msTripDet.getTripType());
+                        msTripDet1.setTripTypeDesp(msTripDet.getTripTypeDesp());
+                        msTripDet1.setTimeCreate(DateTime.now());
+                        msTripDet1.setUserCreate(userCreate);
+                        msTripDet1.setTimeUpdate(DateTime.now());
+                        msTripDet1.setUserUpdate(userCreate);
+                        msTripDetMapper.insert(msTripDet1);
+                    }
+                }
+
+            }
+        }
+    }
+
+
 }

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

@@ -36,13 +36,14 @@ public class MsSuspectedService {
     @Autowired
     private MsReportMapper msReportMapper;
     @Autowired
-    private MsTripMapper msTripMapper;
+    private MsReportService msReportService;
 
     //查询家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public MsSuspected selectSuspected(long suspectedId) {
         return msSuspectedMapper.selectBySuspectedId(suspectedId);
     }
+
     //查询家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public List<MsTripDet> selectTripSuspected(long suspectedId) {
@@ -55,6 +56,32 @@ public class MsSuspectedService {
         return msSuspectedMapper.selectAddSuspected(userCreate);
     }
 
+    //查询用户最近一天的一个人的家人
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public List<MsSuspected> selectNextSuspected(Long userCreate) {
+        List<MsSuspected> listSuspected = null;
+        listSuspected = msSuspectedMapper.selectNextSuspected(userCreate);
+        if (listSuspected != null && listSuspected.size() > 0) {
+            String tripDet;
+            for (MsSuspected msSuspected : listSuspected) {
+                tripDet = "";
+                //出行详细
+                List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(msSuspected.getSuspectedId());
+                if (listDet != null && listDet.size() > 0) {
+                    for (MsTripDet msTripDet : listDet) {
+                        tripDet += "出发地：" + msReportService.getLocalOther(msTripDet.getStartLocal(), msTripDet.getStartLocalOther()) + ",";
+                        tripDet += "目的地：" + msReportService.getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "出行方式：" + msReportService.getTripType(msTripDet.getTripType()) + ",";
+                        tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
+                    }
+                    msSuspected.setTripDet(tripDet.substring(0, tripDet.length() - 1));
+                }
+            }
+
+        }
+        return listSuspected;
+    }
+
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
@@ -268,7 +295,7 @@ public class MsSuspectedService {
         MsSuspected msSuspected = new MsSuspected();
         msSuspected.setTemperatureScore(getTemperatureScore(temperature));
         msSuspected.setScore(addScore(medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea));
-        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId)==null ?0:msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
+        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId) == null ? 0 : msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
         msSuspected.setScoreHistroy(scoreHistroy);
         msSuspected.setScoreRezult(scoreRezulte(medical, msSuspected.getScoreHistroy(), msSuspected.getScore()));
         return msSuspected;
@@ -297,7 +324,9 @@ public class MsSuspectedService {
     public Integer addScore(Integer medical, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea) {
         Integer score = 0;
 
-        if (medical == 0) {
+        if (medical == 1)
+            score = 5;
+        else {
             //温度
             score += getTemperatureScore(temperature);
             //咳嗽
@@ -310,8 +339,8 @@ public class MsSuspectedService {
             score += fatigue;
             //肌肉
             score += diarrhea;
-        } else
-            score = 5;
+        }
+
         return score;
     }
 
@@ -319,7 +348,8 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer scoreRezulte(Integer medical, Integer scoreHistory, Integer score) {
         Integer scoreRezult = 0;
-        if (medical == 0) {
+        if (medical == 1) scoreRezult = 4;
+        else {
             //判断用户是否含有历史评分
             if (scoreHistory == null) {
                 //判断结果
@@ -346,8 +376,7 @@ public class MsSuspectedService {
                         scoreRezult = 4;
                 }
             }
-        } else
-            scoreRezult = 4;
+        }
         return scoreRezult;
     }
 }

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

@@ -257,4 +257,11 @@ public class MsTripService {
         msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
         return reportId;
     }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public Integer deleteTrip(Long suspectedId) {
+        msTripDetMapper.deleteByTripId(suspectedId);
+        msTripMapper.deleteById(suspectedId);
+        return 0;
+    }
 }

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

@@ -4,6 +4,7 @@ package com.bofeng.wx.controller;
 import com.bofeng.entity.*;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
+import com.bofeng.service.MsTripService;
 import com.yvan.Model;
 import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
@@ -31,6 +32,8 @@ public class MsReportController {
     private MsSuspectedService msSuspectedService;
     @Autowired
     private MsReportService msReportService;
+    @Autowired
+    private MsTripService msTripService;
 
     //添加家人
     @PostMapping("/home/addRibao")
@@ -99,24 +102,33 @@ public class MsReportController {
         Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
         MsSuspected msSuspected = msSuspectedService.selectSuspected(suspectedId);
         msSuspectedService.deleteSuspected(suspectedId);
+        msTripService.deleteTrip(suspectedId);
         if (msSuspected != null)
             return msReportService.getByReport(msSuspected.getReportId());
         else
             return null;
     }
 
-    //根据登录人获取家人
+    //根据点击获取家人
     @GetMapping("/home/home/queryRibao")
     public Model<List<MsSuspected>> queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
+        //今日有记录
+        List<MsSuspected> list = msReportService.getByReportReportDate(reportDate, userCreate);
+        if (list != null && list.size() > 0)
+            return Model.newSuccess(list);
+            //获取用户最新的记录
+        else {
+           // return Model.newSuccess(msSuspectedService.selectNextSuspected(userCreate));
+            return null;
+        }
     }
 
     //根据日报获取家人
     @GetMapping("/home/home/queryRibaoRefresh")
-    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId) {
+    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId, @Pd(name = "userCreate") Long userCreate) {
         return Model.newSuccess(msReportService.getByReportId(reportId));
     }
 

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

@@ -97,11 +97,15 @@ public class UserOpenController {
                 return new ModelAndView("/user/home.ftl", model);
             }
             if (list.size() == 1) {
+                //今天数据，今天没有，复制最近一天的数据
                 MsReport msReport = msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             }
             if (list.size() == 2) {
+                //今天数据，今天没有，复制最近一天的数据
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
                 model.put("type", 1);
                 return new ModelAndView("/user/changeRole.ftl", model);
             }