Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi into test_branch

whepi-ui/templates/home/home.ftl

@@ -56,10 +56,17 @@
         });
 
         var uptownId = $("#uptownId").val();
-        if (uptownId == '1238790987234')
+        if (uptownId == '1238790987234'){
             $('#ribao_trip')[0].style.display = 'none';
-        else
+            $('#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();
         family_init();

whepi-ui/templates/home/ribao.ftl

@@ -7,6 +7,11 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
+            <#if (uptownId??) && (uptownId == 11238790987234)>
+            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
+                更改部门
+            </a>
+            </#if>
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
@@ -123,18 +128,31 @@
                 <#--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 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 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 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 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>
+                    <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>
+
 
                     <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>
@@ -296,6 +314,28 @@
                     <br/><br/>
                 </div>
             </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>
+                    <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">
+                            <label for="" class="weui-label" id="danweiTitle">更改部门</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="newUnitId">
+                                <option>请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-form__opr-area">
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定</a>
+                    </div>
+                    <br/><br/>
+                </div>
+            </div>
         </div>
     </div>
 </div>

whepi-ui/templates/home/ribao.js

@@ -298,6 +298,31 @@ function ribao_init() {
       }]
   });
 
+  $("#switchQuezhen_zz").select({
+    title: "选择症状",
+    items: [
+        {
+            title: "无",
+            value: "0",
+        },
+      {
+        title: "新冠确诊",
+        value: "1",
+      },
+      {
+        title: "新冠疑似",
+        value: "2",
+      },
+      {
+        title: "密切接触者",
+        value: "3",
+      },
+      {
+        title: "解除观察",
+        value: "4",
+      }]
+  });
+
   $("#switchDanjiangeli").select({
     title: "选择是否单间隔离",
     items: [
@@ -394,9 +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_cxfs").val("");
-    $("#js_input_cfd").val("");
-    $("#js_input_mdd").val("");
+      $("#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("");
@@ -846,6 +874,27 @@ 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("");
+
+
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -858,6 +907,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 suspectedId = $("#suspectedId").val();
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
@@ -907,6 +961,7 @@ function ribaoCommit() {
   //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
   var statusDesp = "";
   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+  var medicalzz = $("#switchQuezhen_zz").attr("data-values") == undefined ? 0 : $("#switchQuezhen_zz").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
   var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
@@ -1539,6 +1594,9 @@ function clearShow() {
   $("#switchQuezhen").val("");
   $("#switchQuezhen").attr("data-values", "");
 
+  $("#switchQuezhen_zz").val("");
+  $("#switchQuezhen_zz").attr("data-values", "");
+
   $("#switchDanjiangeli").val("");
   $("#switchDanjiangeli").attr("data-values", "");
 
@@ -1584,6 +1642,7 @@ $('#ribao_score').on('click', function () {
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+  var medicalzz = $("#switchQuezhen_zz").attr("data-values") == undefined ? 0 : $("#switchQuezhen_zz").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
   var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
   var muscle = $("#js_input_user_jirou").attr("data-values") == undefined ? 0 : $("#js_input_user_jirou").attr("data-values");

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

@@ -40,6 +40,6 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
             "sys_uptown u ON u.uptown_id = uu.uptown_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
     UptownUnit getUptownUnitByUser(@Param("userId") Long userId);
 
-    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = 1238790987234 and unit_id > 190000 and unit_id < 191000")
+    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = 1238790987234")
     List<UptownUnit> getUptownUnitLY();
 }