Merge branch 'byll' into test

src/html/qcScore.html

@@ -116,11 +116,14 @@
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
                 {{each(i,val) info}}
-                    {{if val['查房类别']&&val['查房类别']=='主治医师查房'}}<!-- 非soap -->
+                    {{if val['查房类别'].indexOf('主刀')!=-1}}<!-- 非soap -->
+     
+                    {{/if}}
+                    {{if val['VTE评分']!=undefined&&(val['查房类别'].indexOf('主刀')==-1)}}
                         <div class="cont">
                             <span class="wardRound">${val['事件日期']}</span>
-                            <span class="wardRound">${val['医生']}</span>
-                            <span class="wardRound">${val['查房类别']}</span>
+                            <span class="wardRound">${val['查房医师']}</span>
+                            <span class="wardRound">${val['查房类别']||val['上级查房医生职称']+'查房'}</span>
                             <table class="wardRound-table">
                                 <tr>
                                     <td class="tdFstTitle">S:</td>
@@ -143,16 +146,11 @@
                             <span class="wardRound"><i>上级医师审核：</i>${val['审核人']}</span>
                             <span class="wardRound"><i>审核时间：</i>${val['审核日期']}</span>
                         </div>
-                    {{else val['查房类别'].indexOf('主刀')!=-1}}
-                        <!-- <div class="cont">
-                            <span>${val['事件日期']}</span>
-                            <span>${val['医生']}</span>
-                            <span>${val['查房备注']}</span>
-                        </div> -->
-                    {{else val['查房类别']==''}}
+                    {{/if}}
+                    {{if val['VTE评分']==undefined&&(val['查房类别'].indexOf('主刀')==-1)}}
                         <div class="cont">
                             <span class="wardRound">${val['事件日期']}</span>
-                            <span class="wardRound">${val['医生']}</span>
+                            <span class="wardRound">${val['查房医师']}</span>
                             <span class="wardRound">${val['查房备注']}</span>
                             <p>${val['查房记录']}</p>
                             <span class="wardRound"><i>记录医师：</i>${val['医生']}</span>

src/js/console.js

@@ -65,7 +65,7 @@ function initConsole(result){
             if(name=='本月病历数'||name=='本年病历数'){
                 num = result[i]
             }else{
-                num = (result[name+'-机器']+result[i])/2
+                num = result[name+'-人工']+result[i]
             }
             dom += `
                 <li class="partLi">