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

src/pages/main/PatientBox.vue

@@ -137,7 +137,7 @@
           // 未签到称重
           return 5
         }
-        if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
+        if(schedual.prescription == null || schedual.prescription.creater == 0){
           // 未确认处方
           return 6
         }

src/pages/main/WaitingArea.vue

@@ -270,7 +270,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.prescription_doctor == 0) {
+            if (schedual.prescription == null || schedual.prescription.creater == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
@@ -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.prescription_doctor == 0) {
+          if (schedual.prescription == null || schedual.prescription.creater == 0) {
             scheduals.push(schedual);
           }
         }
@@ -381,7 +381,7 @@ export default {
           schedualMap[schedual.device_number.zone.id] = [];
         }
         if (this.select_index == 1) {
-            if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
+            if(schedual.prescription == null || schedual.prescription.creater == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             prescription_count++
           }

src/pages/main/today/TodayTab.vue

@@ -333,7 +333,7 @@
           {title: '治疗小结', name: 'treatment_of', value: 0}
         ]
 
-        if (!isNaN(this.prescription.id) && this.prescription.id > 0 && this.prescription.prescription_doctor> 0) {
+        if (!isNaN(this.prescription.id) && this.prescription.id > 0 && this.prescription.creater> 0) {
           steps[0].value = 1
         }
         if (