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

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -21,7 +21,7 @@
             </td>
             <td width="120" style="border:none;text-align: left;">
               年 龄：
-              <span>{{ getAge(patientInfo) }}</span>
+              <span>{{ getNewAge(patientInfo.id_card_no) }}</span>
             </td>
 
 
@@ -164,10 +164,8 @@
             </td>
             <td colspan="4" style="padding-left:5px;border-left:1px solid #000;padding-left:5px">
               医师签名：
-              <span v-if="setAdminUserES(prescription.creater) == ''">
-                {{ getAdminUser(prescription.creater) }}
-              </span>
-              <img class="es-img" style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset v-else />
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+              <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
             </td>
           </tr>
           <tr style="text-align:left">
@@ -1253,6 +1251,19 @@ export default {
     };
   },
   methods: {
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
     getDisplaceLiquiPart: function(val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;