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

src/pages/main/WaitingArea.vue

@@ -306,7 +306,7 @@ export default {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
+          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
             scheduals.push(schedual);
           }
         }
@@ -316,7 +316,7 @@ export default {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.prescription == null || schedual.prescription.creater == 0) {
+          if (schedual.prescription == null || schedual.prescription.prescription_doctor == 0) {
             scheduals.push(schedual);
           }
         }