Merge remote-tracking branch 'origin/masterNew' into TCM0513

src/js/cdss.js

@@ -249,6 +249,7 @@ function renderPushData(){
   return getPushInfo().then(res =>{
     hasCompleteTnterface++
     if(res.data.code == "0"){
+      console.log(1)
       const result = res.data.data
       let diagPush = result.dis ||{}
       let lisPush = result.lis || []
@@ -434,6 +435,7 @@ function renderBillingPush(list,name,code){
 
 function renderDiag(diagPush){
   let possibleDiagPush = diagPush["可能诊断"] || []
+  let previousDiagPush = diagPush["既往诊断"] || []
   let firstDiagPush = diagPush["初步诊断"] || []
   let identifyDiagPush = diagPush["鉴别诊断"] || []
   let warningDiagPush = diagPush["警惕"] || []
@@ -445,6 +447,7 @@ function renderDiag(diagPush){
   // let firstDiagPush =  [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
   // let identifyDiagPush = diagPush["鉴别诊断"] ||  [{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
   renderDiagItem(possibleDiagPush,"可能诊断",number)
+  renderDiagItem(previousDiagPush, "既往诊断", number)
   renderDiagItem(firstDiagPush,"初步诊断",number)
   renderDiagItem(identifyDiagPush,"鉴别诊断",number)
   renderWarningDiag(warningDiagPush,"警惕",warnNumber)