Merge branch 'version1.3.7' into test

src/css/qcListOutHospital.less

@@ -136,7 +136,7 @@ table{
 }
 .filter-toggler{
     position: absolute;
-    left: 1028px;
+    left: 1033px;
     top: 8px;
     color: #777;
     white-space: nowrap;

src/css/qcScore.less

@@ -860,4 +860,10 @@
   position: relative;
   width: 100%;
   opacity: .5;
+}
+.liExtend{
+  position: absolute;
+  right: -3px;
+  width: 3px;
+  height: 40px;
 }

src/html/qcListOutHospital.html

@@ -24,9 +24,9 @@
                         <ul class="leaveHosTypeList filterDropList">
                             <Li class="leaveHosTypeItem" data-name="全部" data-id="全部">全部</Li>
                             <Li class="leaveHosTypeItem" data-name="死亡人数" data-id="1">死亡人数</Li>
-                            <Li class="leaveHosTypeItem" data-name="新生儿人数" data-id="2">新生儿人数</Li>
+                            <Li class="leaveHosTypeItem" data-name="新生儿患者" data-id="2">新生儿患者</Li>
                             <li class="leaveHosTypeItem" data-name="手术病人数" data-id="3">手术病人数</li>
-                            <li class="leaveHosTypeItem" data-name="非医嘱离院病人人数" data-id="4">非医嘱离院病人人数</li>
+                            <li class="leaveHosTypeItem" data-name="非医嘱离院病人数" data-id="4">非医嘱离院病人数</li>
                             <!-- <li class="leaveHosTypeItem" data-name="31日再入院病人人数" data-id="5">31日再入院病人人数</li> -->
                         </ul>
                     </span>

src/html/qcScore.html

@@ -22,13 +22,14 @@
     <script type="text/html" id="miniMenuTmpl">
         {{if sonMode.length}}
         <li class="list-1  menu-${id}">
+            <div class="liExtend"></div>
             {{else}}
         <li class="page  menu-${id}" code="${name}">
             {{/if}}
             {{if sonMode.length}}
-            <ul>
+            <ul> 
                 {{each sonMode}}
-                <li class="page" code="${name.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">${name}</li>
+                    <li class="page" code="${name.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">${name}</li>
                 {{/each}}
             </ul>
             {{/if}}
@@ -229,7 +230,7 @@
     <script type="text/html" id="appointBookTmpl">
         <div class="page-item" code="${title}">
             <h2 class="title" code="${title}">${title}</h2>
-            {{if !data || data&&data.length === 0}}
+            {{if !data || data&&data.length === 0 || JSON.stringify(data) == "{}"}}
             <div class="empty">
                 <img src="../images/empty.png" alt="空"/>
                 <p>暂无信息～</p>

src/js/console.js

@@ -554,7 +554,7 @@ function personNum(data){
     }
     $(".personNum").html("总人数："+data['总人数']).parent(".chuyuannum").attr("data-num",'全部')
     $(".died").html(data['死亡人数']).parent(".chuyuannum").attr("data-num",'死亡人数')
-    $(".newborn").html(data['新生儿人数']).parent(".chuyuannum").attr("data-num",'新生儿人数')
+    $(".newborn").html(data['新生儿人数']).parent(".chuyuannum").attr("data-num",'新生儿患者')
     $(".patientNum").html(data['手术病人数']).parent(".chuyuannum").attr("data-num",'手术病人数')
     $(".goAwayNum").html(data['非医嘱离院病人数']).parent(".chuyuannum").attr("data-num",'非医嘱离院病人数')
     $(".againNum").html(data['31日再入院病人数']).parent(".chuyuannum").attr("data-num",'31日再入院病人数')