Merge branch 'dev_zxc' into test

src/html/qcScore.html

@@ -1035,7 +1035,7 @@
                     </div>
                     <div class="cont">
                         <span class="label">出生日期:</span>
-                        <span>${出生日期}</span>
+                        <span>${出生日期.slice(0,10)}</span>
                     </div>
                     <div class="cont">
                         <span class="label">年龄:</span>

src/js/qcScore.js

@@ -46,6 +46,7 @@ function getRecordDetail(){
   post(api.getRecordDetail,{'behospitalCode':global_id}).then(function(res){
     if(res.data.code==='0'){
       const data = res.data.data;
+   
       const {beHospital,result,msg} = data;
       const info=Object.assign(beHospital,result);
       initMenu(JSON.parse(result.menuData));
@@ -58,6 +59,7 @@ function getRecordDetail(){
       global_flawData=msg;
 
       let obj = JSON.parse(result.pageData)
+     
       wardRound(obj['查房记录'],'查房记录')
       preoperation(obj['术前讨论、术前小结'],'术前讨论、术前小结')
       summary(obj['阶段小结'],'阶段小结')
@@ -71,7 +73,7 @@ function getRecordDetail(){
 }
 //填充患者信息
 function initPatientInfo(data){
-  const date = data.birthday.substr(0,10);
+  const date = data.birthday&&data.birthday.substr(0,10);
   const age=new Date(date).getTime()/(365*24*60*60*1000);
   const obj=Object.assign({},data,{age:global_age});
   $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
@@ -96,12 +98,11 @@ function initContent(data){
     "死亡病例讨论记录":"#discusionAboutDeathTmpl",
     "病理检验送检单":"#pathologicTestTmpl"
   };
-  // console.log('obj',obj)
+
   for(let k in obj){
-  
     for(let i in obj[k]){
       info=formatInfoData(k,obj[k][i]);
-      nameMap[k]&&$(nameMap[k]).tmpl(info).appendTo("#contentInfo");
+      nameMap[k]&&Object.keys(obj[k][i]).length !== 0 &&$(nameMap[k]).tmpl(info).appendTo("#contentInfo");
     }
   }
   if(obj["病案首页"][0]["出院诊断"]){

src/js/qcScore_byll.js

@@ -4,33 +4,26 @@ function wardRound(data,title){//查房记录
     $("#wardRound").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 function preoperation(data,title){//术前
-    console.log(data,title,'术前讨论、术前小结')
     $("#preoperation").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 function summary(data,title){
-    console.log(data,title,'阶段小结')
     $("#summary").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 function operationRecord(data,title){
-    console.log(data,title,'手术记录')
     $("#operationRecord").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 
 function applicationForm(data,title){
-    console.log(data,title,'会诊申请单')
     $("#applicationForm").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 function resultForm(data,title){
-    console.log(data,title,'会诊结果单')
     $("#resultForm").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 
 function consultationNote(data,title){
-    console.log(data,title,'会诊记录')
     $("#consultationNote").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }
 function difficultRecord(data,title){
-    console.log(data,title,'疑难病例讨论记录')
     $("#difficultRecord").tmpl({info:data,title:title,}).appendTo("#contentInfo");
 }