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

src/html/qcScore.html

@@ -603,7 +603,7 @@
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">手术时数：</span>
-                                <span>${val['手术时数']}</span>
+                                <span>${val['手术时数']&&val['手术时数']+'分'}</span>
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">术前诊断：</span>
@@ -629,6 +629,14 @@
                                 <span class="lineTitle">助手II：</span>
                                 <span>${val['助手II']}</span>
                             </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">器械护士：</span>
+                                <span>${val['器械护士1']} ${val['器械护士2']}</span>
+                            </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">巡回护士：</span>
+                                <span>${val['巡回护士1']} ${val['巡回护士2']}</span>
+                            </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">麻醉方式：</span>
                                 <span>${val['麻醉方式']}</span>
@@ -649,10 +657,27 @@
                                 <span class="lineTitle">手术经过及处理（包括患者的体位、切口处理、病灶所见及手术步骤等）：</span>
                                 <span>${val['手术经过']}</span>
                             </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">手术风险评估：</span>
+                                <span>手术切口清洁程度（   分）+麻醉ASA分级（   分）+手术持续时间（   分）=    分 
+                                </span>
+                            </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">NNIS分级：</span>
+                                <span>${val['NNIS分级']}</span>
+                            </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">手术类别(可选)：</span>
+                                <span>${val['手术类别']}</span>
+                            </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">手术标本：</span>
                                 <span>${val['手术标本']}</span>
                             </p>
+                            <p class="lineBlock">
+                                <span class="lineTitle">术中送检：</span>
+                                <span>${val['是否术中送检']}</span>
+                            </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">冰冻切片结果：</span>
                                 <span>${val['冰冻切片结果']}</span>
@@ -663,18 +688,21 @@
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">术中失血量：</span>
-                                <span>${val['失血']}</span>
+                                <span>${val['失血']&&val['失血']+'ml'}</span>
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">输血情况：</span>
                                 <span>${val['输血情况']}</span>
                             </p>
+                            {{if 输血情况 == '有输血'}}
                             <p class="lineBlock">
-                                <span class="lineTitle">主刀医师签名：</span>
-                                <span>${val['医生']}</span>
+                                <span>红细胞 ${val['红细胞']} 单位 血小板 ${val['血小板']} 袋 血浆 ${val['血浆']} ml 目前输血 ${val['全血']} ml</span>
                             </p>
+                            {{/if}}
                             <p class="lineBlock">
-                                <span class="lineTitle">外院专家：</span>
+                                <span class="lineTitle">主刀医师签名：</span>
+                                <span>${val['医生']}</span>
+                                <span class="lineTitle">或外院专家：</span>
                                 <span>${val['被邀请专家']}</span>
                             </p>
                             <p class="lineBlock">