Merge branch 'dev_zxc' into test

src/html/qcScore.html

@@ -1059,7 +1059,7 @@
                     </div>
                     <div class="cont">
                         <span class="label">年龄:</span>
-                        <span>${年龄}</span>
+                        <span>${年龄}${年龄单位}</span>
                     </div>
                     <div class="cont">
                         <span class="label">国籍:</span>
@@ -1673,52 +1673,56 @@
         <div class="content-item" code="${title}">
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
-                <div class="info-item">
-                    <div class="cont">
-                        <span class="label">姓名:</span>
-                        <span>${本人姓名}</span>
-                    </div>
-                    <div class="cont">
-                        <span class="label">性别:</span>
-                        <span>${性别}</span>
-                    </div>
-                    <div class="cont">
-                        <span class="label">科别:</span>
-                        <span>${临床科室}</span>
-                    </div>
-                    <div class="cont">
-                        <span class="label">床号:</span>
-                        <span>${床号}</span>
-                    </div>
-                    <div class="cont">
-                        <span class="label">病案号:</span>
-                        <span>${病历号}</span>
-                    </div>
-                    <div class="cont">
-                        <span class="label">年龄:</span>
-                        <span>${年龄}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">输血后症状体征变化:</span>
-                        <span>${输血后生命体征变化}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">复查相关实验室指标:</span>
-                        <span></span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">输血疗效:</span>
-                        <span>${输血疗效}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">记录医师:</span>
-                        <span>${医生}</span>
-                    </div>
-                    <div class="contP">
-                        <span class="label">记录时间:</span>
-                        <span>${病历日期}</span>
+                {{each(i,val) info}}
+                <div class="content-item-wrapper">
+                    <div class="info-item">
+                        <div class="cont">
+                            <span class="label">姓名:</span>
+                            <span>${本人姓名}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">性别:</span>
+                            <span>${性别}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">科别:</span>
+                            <span>${临床科室}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">床号:</span>
+                            <span>${床号}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">病案号:</span>
+                            <span>${病历号}</span>
+                        </div>
+                        <div class="cont">
+                            <span class="label">年龄:</span>
+                            <span>${年龄}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">输血后症状体征变化:</span>
+                            <span>${输血后生命体征变化}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">复查相关实验室指标:</span>
+                            <span></span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">输血疗效:</span>
+                            <span>${输血疗效}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">记录医师:</span>
+                            <span>${医生}</span>
+                        </div>
+                        <div class="contP">
+                            <span class="label">记录时间:</span>
+                            <span>${病历日期}</span>
+                        </div>
                     </div>
                 </div>
+                {{/each}}
             </div>
         </div>
     </script>
@@ -1757,7 +1761,7 @@
                     </div>
                     <div class="contP">
                         <span class="label">诊断:</span>
-                        <span>${诊断}</span>
+                        <span>${当前诊断}</span>
                     </div>
                     <div class="cont">
                         <span class="label">死亡原因:</span>
@@ -1765,7 +1769,7 @@
                     </div>
                     <div class="cont">
                         <span class="label">讨论日期:</span>
-                        <span>${讨论日期}</span>
+                        <span>${事件日期}</span>
                     </div>
                     <div class="cont">
                         <span class="label">讨论地点:</span>
@@ -2368,6 +2372,7 @@
         <div class="content-item" code="${title}">
             <h2 class="title">${title}</h2>
             <div class="container content-ht">
+                {{each(i, val) info}}
                 <div class="info-item">
                     <div class="cont">
                         <span class="label">姓名:</span>
@@ -2426,6 +2431,7 @@
                         <span>${审核日期}</span>
                     </div>
                 </div>
+                {{/each}}
             </div>
         </div>
     </script>

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 {wardRound,preoperation,summary,operationRecord,applicationForm,resultForm,consultationNote,difficultRecord,illnessNotice,pathologicTest} = require("./qcScore_byll.js")
+const {wardRound,preoperation,summary,operationRecord,applicationForm,resultForm,consultationNote,difficultRecord,illnessNotice,pathologicTest,rescueRecord,transfusionEvaluate} = require("./qcScore_byll.js")
 //本页全局变量
 let global_flawData = {};    //缺陷数据
 const global_id=getUrlArgObject("id");
@@ -68,6 +68,8 @@ function getRecordDetail(){
       infoNotNull(obj,'疑难病例讨论记录')&&difficultRecord(obj['疑难病例讨论记录'],'疑难病例讨论记录')
       infoNotNull(obj,'病危通知书')&&illnessNotice(obj['病危通知书'],'病危通知书')
       infoNotNull(obj,'病理检验送检单')&&pathologicTest(obj['病理检验送检单'],'病理检验送检单')
+      infoNotNull(obj,'抢救记录')&&rescueRecord(obj['抢救记录'],'抢救记录')
+      infoNotNull(obj,'输血后效果评价')&&transfusionEvaluate(obj['输血后效果评价'],'输血后效果评价')
       setBoxHeight();
     }
   });
@@ -95,11 +97,11 @@ function initContent(data){
     "手术知情同意书":"#surgeryBookTmpl",
     "首次病程录":"#firstCourseTmpl",
     // "病危通知书":"#illnessNoticeTmpl",
-    "抢救记录":"#rescueRecordTmpl",
+    // "抢救记录":"#rescueRecordTmpl",
     "术后首次病程及谈话记录":"#surgeryAfRecord",
     "危急值记录":"#dangerRecore",
     "输血/血制品病程记录":"#transfusionRecordTmpl",
-    "输血后效果评价":"#transfusionEvaluateTmpl",
+    // "输血后效果评价":"#transfusionEvaluateTmpl",
     "死亡记录":"#deathRecordTmpl",
     "死亡病例讨论记录":"#discusionAboutDeathTmpl",
     // "病理检验送检单":"#pathologicTestTmpl"

src/js/qcScore_byll.js

@@ -32,7 +32,12 @@ function illnessNotice(data,title){
 function pathologicTest(data, title){
     $("#pathologicTestTmpl").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
-
+function rescueRecord(data, title){
+    $("#rescueRecordTmpl").tmpl({info:data,title:title,}).appendTo("#contentInfo");
+}
+function transfusionEvaluate(data, title){
+    $("#transfusionEvaluateTmpl").tmpl({info:data,title:title,}).appendTo("#contentInfo");
+}
 module.exports = {
     wardRound,
     preoperation,
@@ -43,5 +48,7 @@ module.exports = {
     consultationNote,
     difficultRecord,
     illnessNotice,
-    pathologicTest
+    pathologicTest,
+    rescueRecord,
+    transfusionEvaluate
 }