Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

     getoldAge(){
       let date = new Date()
       let year = date.getFullYear()
+      // let year = 2034
       let year_d = year-this.xtdate.split('-')[0]
-      return year_d
+      let year_m = this.xtdate.split('-')[1]
+      let birth_m = this.patientInfo.birth.split('-')[1]
+      let year_date = this.xtdate.split('-')[2]
+      let birth_date = this.patientInfo.birth.split('-')[2]
+      // console.log(year,'今年年月')
+      // console.log(this.xtdate.split('-'),'病人就诊年月')
+      // console.log(this.patientInfo.birth,'病人生日')
+      if(year_m < birth_m){
+        return year_d - 1
+      }else if(year_m = birth_m){
+        if(year_date < birth_date){
+          return year_d - 1
+        }else{
+          return year_d
+        }
+      }else{
+        return year_d
+      }
     },
 
 
           return val.age;
         }
       } else {
-        return jsGetAge(val.birth, "-");
+        return this.getoldAge()
       }
     },
     newAdviceGroupObject: function () {