Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

config/prod.env.js

@@ -1,9 +1,9 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
 
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
+   BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 };

src/pages/main/PatientBox.vue

@@ -234,13 +234,13 @@ export default {
       }
     },
     age: function(schedual) {
-      if (schedual.patient.age == 0) {
+      if (schedual.patient.birthday != 0) {
         return jsGetAge(
           parseTime(schedual.patient.birthday, "{y}-{m}-{d}"),
           "-"
         );
       } else {
-        return schedual.patient.age;
+        return ''
       }
 
       // var now = new Date();

src/pages/main/template/DialysisPrintOrderFive.vue

@@ -1660,14 +1660,10 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
-            return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
-          }
-        } else {
+        if (val.birthday != 0) {
           return jsGetAge(val.birth, '-')
+        } else {
+          return ''
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -1459,15 +1459,15 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
+        // if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
+          if (val.birthday != 0) {
             return jsGetAge(val.birth, '-')
           } else {
-            return val.age
+            return ''
           }
-        } else {
-          return jsGetAge(val.birth, '-')
-        }
+        // } else {
+        //   return jsGetAge(val.birth, '-')
+        // }
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -1354,14 +1354,10 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
-            return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
-          }
-        } else {
+        if (val.birthday != 0) {
           return jsGetAge(val.birth, '-')
+        } else {
+          return ''
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -1579,14 +1579,10 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
-            return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
-          }
-        } else {
+        if (val.birthday != 0) {
           return jsGetAge(val.birth, '-')
+        } else {
+          return ''
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(

src/pages/main/today/detailsInfo.vue

@@ -115,10 +115,11 @@ export default {
       return parseTime(this.$route.query.date, "{y}/{m}/{d}");
     },
     age: function() {
-      if (this.patient.age == 0) {
-        return jsGetAge(parseTime(this.patient.birthday, "{y}-{m}-{d}"), "-");
+      if (this.patient.birthday == 0) {
+        return ''
       } else {
-        return this.patient.age;
+        return jsGetAge(parseTime(this.patient.birthday, "{y}-{m}-{d}"), "-");
+
       }
     },
     source: function() {