Merge remote-tracking branch 'origin/test' into test

src/css/index.less

@@ -159,6 +159,7 @@
     width: 90px;
     display: inline-block;
     text-align: right;
+    color: #777;
   }
   .oldWaring {
     color: #FF4D4F;

src/css/qcScore.less

@@ -257,4 +257,33 @@
     margin-right: 20px;
     text-align: right;
   }
+}
+
+.wardRoundWrap {
+  .container {
+    .wardRound {
+      margin-right: 50px;
+      padding: 7px  0;
+      display: inline-block;
+      i {
+        font-weight: bold;
+        color: #333333;
+      }
+    }
+    .cont {
+      .wardRound-table {
+        border: 0 none;
+        td {
+          border: 0 none;
+          text-align: left;
+          padding-left: 0;
+          color: #333333;
+        }
+        .tdFstTitle {
+          vertical-align: top;
+          font-weight: bold;
+        }
+      }
+    }
+  }
 }

src/html/qcScore.html

@@ -110,6 +110,58 @@
          </table>
          {{/if}}
     </script>
+    <!-- 查房记录 -->
+    <script type="text/html" id="wardRound">
+        <div class="content-item wardRoundWrap" code="${title}">
+            <h2 class="title">${title}</h2>
+            <div class="container content-ht">
+                {{each(i,val) info}}
+                    {{if val['查房类别']&&val['查房类别']=='主治医师查房'}}<!-- 非soap -->
+                        <div class="cont">
+                            <span class="wardRound">${val['事件日期']}</span>
+                            <span class="wardRound">${val['医生']}</span>
+                            <span class="wardRound">${val['查房类别']}</span>
+                            <table class="wardRound-table">
+                                <tr>
+                                    <td class="tdFstTitle">S:</td>
+                                    <td>${val['主诉']}</td>
+                                </tr>
+                                <tr>
+                                    <td class="tdFstTitle">O:</td>
+                                    <td>${val['体检']}</td>
+                                </tr>
+                                <tr>
+                                    <td class="tdFstTitle">A:</td>
+                                    <td>${val['简要病情']}</td>
+                                </tr>
+                                <tr>
+                                    <td class="tdFstTitle">P:</td>
+                                    <td>${val['治疗计划和措施']}</td>
+                                </tr>
+                            </table>
+                            <span class="wardRound"><i>记录医师：</i>${val['查房医师']}</span>
+                            <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['查房类别']==''}}
+                        <div class="cont">
+                            <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>
+                        </div>
+                    {{/if}}
+                {{/each}}
+            </div>
+        </div>
+    </script>
     <script type="text/html" id="flawTmpl">
         <div class="flaw-item" code="${modelName}">
             <div class="title">${msg}</div>

src/js/console.js

@@ -57,16 +57,23 @@ function initConsole(result){
         '本年甲级病历-机器':require("../images/icon8.png"),
         '本年乙级病历-机器':require("../images/icon9.png"),
     }
-    let dom = ''
+    let dom = '';
     for(let i in result){
         if(i.indexOf("人工")==-1){
+            let name = i.split("-")[0];
+            let num = 0;
+            if(name=='本月病历数'||name=='本年病历数'){
+                num = result[i]
+            }else{
+                num = (result[name+'-机器']+result[i])/2
+            }
             dom += `
                 <li class="partLi">
                     <div class="partIn">
-                        <p class="top">${i.split("-")[0]}</p>
+                        <p class="top">${name}</p>
                         <p class="btm clearfix">
                         <img src="${url[i]}" alt="">
-                        <span>${result[i]}</span>
+                        <span>${num}</span>
                         </p>
                     </div>
                 </li>

src/js/modal.js

@@ -52,8 +52,8 @@ const jQuery = require('jquery');
                 box.remove();
             }, ops.time);
         }
-        $(document).on('click',".alertModal .title img, .modalBg",function(){
-            box.remove();
-        })
+        // $(document).on('click',".alertModal .title img, .modalBg",function(){
+        //     box.remove();
+        // })
     }
 })(jQuery);

src/js/qcScore.js

@@ -4,7 +4,7 @@ require('jquery-templates');
 require('./modal.js');
 const {api,post,getUrlArgObject,setBoxHeight} = require('./utils.js');
 const {keyMaps} = require('./maps.js');
-const {wordRound} = require("./qcScore_byll.js")
+const {wardRound} = require("./qcScore_byll.js")
 //本页全局变量
 let global_flawData = {};    //缺陷数据
 const global_id=getUrlArgObject("id");
@@ -54,10 +54,12 @@ function getRecordDetail(){
       setBoxHeight();
       initScoreItem(msg);
       global_flawData=msg;
+
+      let obj = JSON.parse(result.pageData)
+      wardRound(obj['查房记录'],'查房记录')
     }
   });
 }
-
 //填充患者信息
 function initPatientInfo(data){
   const date = data.birthday.substr(0,10);
@@ -86,7 +88,6 @@ function initContent(data){
     $("#tableTmpl").tmpl({k:"手术信息",data:diag}).appendTo("#surgeryTable");
   }
   $(".content-item[code="+global_activeTab+"]").show();
-  console.log(obj)
 }
 
 function formatInfoData(k,data){

src/js/qcScore_byll.js

@@ -1,7 +1,10 @@
-function wordRound(){
-    
+const $ = require('jquery');
+
+function wardRound(data,title){//查房记录
+    console.log(data,title)
+    $("#wardRound").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 
 module.exports = {
-    wordRound
+    wardRound
 }