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

src/css/qcScore.less

@@ -87,7 +87,7 @@
   margin-left: @menuWt+10px;
   height: 100%;
   .content-box{
-    width:70%;
+    width:78%;
     height: 100%;
     position: relative;
     overflow-y: auto;
@@ -232,7 +232,7 @@
     }
   }
   .operation{
-    width:28%;
+    width:20%;
     height: 100%;
     margin-right: 10px;
     position: relative;
@@ -425,6 +425,18 @@
 .textPreLine{
   white-space: pre-line;
 }
+.textIndent30{
+  text-indent:30px
+}
+.textBold{
+  font-weight: bold;
+}
+.padL30{
+  padding-left: 30px;
+}
+.displayInlineBlock{
+  display: inline-block;
+}
 
 /********缺陷总览*********/
 .flaw-table{

src/html/qcScore.html

@@ -117,14 +117,14 @@
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
                 {{each(i,val) info}}
-                    {{if val['查房类别'].indexOf('主刀')!=-1}}<!-- 非soap -->
-     
+                    {{if val['查房类别'].indexOf('主刀') != -1}}<!-- 非soap -->
+                       
                     {{/if}}
-                    {{if val['VTE评分']!=undefined&&(val['查房类别'].indexOf('主刀')==-1)}}
+                    {{if ((val['VTE评分']!=undefined&&(val['查房类别'].indexOf('主刀')==-1))||(val['查房类别'].indexOf('主刀') > -1))}}
                         <div class="cont">
-                            <span class="wardRound">${val['事件日期']}</span>
-                            <span class="wardRound">${val['查房医师']}</span>
-                            <span class="wardRound">${val['查房类别']||val['上级查房医生职称']+'查房'}</span>
+                            <span class="wardRound textBold">${val['事件日期']}</span>
+                            <span class="wardRound textBold">${val['查房医师']}</span>
+                            <span class="wardRound textBold">${val['查房类别']||val['上级查房医生职称']+'查房'}</span>
                             <table class="wardRound-table">
                                 <tr>
                                     <td class="tdFstTitle">S:</td>
@@ -132,7 +132,11 @@
                                 </tr>
                                 <tr>
                                     <td class="tdFstTitle">O:</td>
-                                    <td>${val['体检']}</td>
+                                    {{if 体检}}
+                                        <td>${val['体检']}</td>
+                                    {{else}}
+                                    <td>${val['VTE风险评估']}${val['VTE评分']}${val['营养风险总评分']}</td>
+                                    {{/if}}
                                 </tr>
                                 <tr>
                                     <td class="tdFstTitle">A:</td>
@@ -143,17 +147,17 @@
                                     <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>
                             <span class="wardRound"><i>审核时间：</i>${val['审核日期']}</span>
                         </div>
                     {{/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>
-                            <p>${val['查房记录']}</p>
+                            <span class="wardRound textBold">${val['事件日期']}</span>
+                            <span class="wardRound textBold">${val['查房医师']}</span>
+                            <span class="wardRound textBold">${val['查房备注']}</span>
+                            <p class="textIndent30">${val['查房记录']}</p>
                             <span class="wardRound"><i>记录医师：</i>${val['医生']}</span>
                         </div>
                     {{/if}}
@@ -808,16 +812,16 @@
                     </div>
                     <div class="cont">
                         <span class="label">病史陈述者:</span>
-                        <span>${病史陈述者}</span>
+                        <span>${信息来源}${关系}</span>
                     </div>
                 </div>
                 <div class="info-item">
                     <div class="info-title">主诉</div>
-                    <div class="cont">
+                    <div class="cont textIndent30">
                         <span>${主诉}</span>
                     </div>
                     <div class="info-title">现病史</div>
-                    <div class="cont">
+                    <div class="cont textIndent30">
                         <span>{{html 现病史}}</span>
                     </div>
                     <div class="cont">
@@ -1042,18 +1046,18 @@
                 </div>
                 <div class="info-item">
                     <div class="info-title">专科检查:</div>
-                    <div class="cont">
+                    <div class="cont textIndent30">
                         <span>{{html 专科检查}}</span>
                     </div>
                 </div>
                 <div class="info-item">
                     <div class="info-title">辅助检查:</div>
                     <div class="info-title">实验室检查:</div>
-                    <div class="cont">
+                    <div class="cont textIndent30">
                         <span>{{html 实验室检查}}</span>
                     </div>
                     <div class="info-title">影像学检查:</div>
-                    <div class="cont">
+                    <div class="cont textIndent30">
                         <span>{{html 影像学检查}}</span>
                     </div>
                 </div>
@@ -1064,15 +1068,15 @@
                 <div class="info-item">
                     <div class="info-title">初步诊断</div>
                     <div class="cont">
-                        <span>{{html 初步诊断}}</span>
+                        <span class="displayInlineBlock padL30">{{html 初步诊断}}</span>
                     </div>
                     <div class="info-title">修正诊断</div>
                     <div class="cont">
-                        <span>{{html 修正诊断}}</span>
+                        <span class="displayInlineBlock padL30">{{html 修正诊断}}</span>
                     </div>
                     <div class="info-title">补充诊断</div>
                     <div class="cont">
-                        <span>{{html 补充诊断}}</span>
+                        <span class="displayInlineBlock padL30">{{html 补充诊断}}</span>
                     </div>
                 </div>
                 <div class="info-item">
@@ -1656,7 +1660,7 @@
                     </div>
                     <div class="cont">
                         <span class="label">医疗组长:</span>
-                        <span>${医疗组长}</span>
+                        <span>${主诊医生}</span>
                     </div>
                     <div class="contP">
                         <span class="label">入院诊断:</span>
@@ -1673,22 +1677,31 @@
                     <div class="cont">
                         <span class="label">体格检查:</span>
                         <span>${体格检查}</span>
-                        <span>体温${体温耳}℃</span>
+                        <span>体温${体温}${体温耳}℃</span>
                         <span>脉搏${脉搏}次/分</span>
                         <span>呼吸${呼吸}次/分</span>
                         <span>血压${血压}mmHg</span>
-                        <span>${专科检查}</span>
+                        <p><span>${专科检查}</span></p>
                     </div>
                     <div class="cont">
                         <span class="label">辅助检查:</span>
-
-                        
                         <span>${实验室检查}</span>
                         <span>${影像学检查}</span>
+                        <span>${辅助检查结果}</span>
                     </div>
-                    <div class="cont">
+                    <div class="contP">
+                        <div class="cont">
+                            <span class="label">病理诊断:</span>
+                            <span>${病理诊断有无}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">病理号:</span>
+                            <span>${病理号}</span>
+                        </div>
+                    </div>
+                    <div class="contP">
                         <span class="label">住院诊治经过(包括重要发现和结论，接受的药物和其他治疗) :</span>
-                        <span>${诊治经过}</span>
+                        <span>${诊治经过}于${手术日期}在${麻醉方式}下行${手术名称}，切口类别为${切口类别}切口愈合等级为${切口愈合等级}。${治疗}</span>
                     </div>
                     <div class="cont">
                         <span class="label">出院时情况（症状与体征）:</span>
@@ -1706,9 +1719,10 @@
                         <span class="label">出院带药:</span>
                         <span>${出院医嘱}</span>
                     </div>
-                    <div class="cont">
+                   
+                    <div class="contP">
                         <span class="label">健康教育（包括饮食指导）:</span>
-                        <span>${出院指导}</span>
+                        <span>{{html 出院指导}}</span>
                     </div>
                     <div class="contP">
                         <span class="label">随访计划（复诊安排）:</span>
@@ -1717,7 +1731,7 @@
                             <tr>
                                 <td>时间</td>
                                 <td>地点</td>
-                                <td>随访目的</td>
+                                <td>复诊目的</td>
                                 <td>科室</td>
                             </tr>
                             <tr>
@@ -1728,6 +1742,7 @@
                             </tr>
                             </tbody>
                         </table>
+                        <p>${其他}</p>
                     </div>
                     <div class="cont">
                         <span class="label">医生签名:</span>