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/bloodPresssWatch.vue

@@ -703,7 +703,7 @@ export default {
       }
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
-        console.log("2222",response.data.data.schedule)
+        console.log("排班对于23333223323223232",response.data.data.schedule)
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -717,41 +717,36 @@ export default {
               const SchedualPatientsTable = {
                 bp: []
               };
-              SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
+              if(response.data.data.schedule[i].dialysis_order!=null){
+                SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
+              }
+          
               SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
               SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
-              SchedualPatientsTable["dialysis_no"] =
-                response.data.data.schedule[i].patient.dialysis_no;
-              SchedualPatientsTable["name"] =
-                response.data.data.schedule[i].patient.name;
-              SchedualPatientsTable["number"] =
-                response.data.data.schedule[i].device_number.number;
-              SchedualPatientsTable["gender"] =
-                response.data.data.schedule[i].patient.gender;
-              SchedualPatientsTable["source"] =
-                response.data.data.schedule[i].patient.source;
-              SchedualPatientsTable["patient_id"] =
-                response.data.data.schedule[i].patient_id;
-              SchedualPatientsTable["mode_name"] =
-                response.data.data.schedule[i].treatment_mode.name;
-              SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
-              if (
-                response.data.data.schedule[i].assessment_before_dislysis.id > 0
-              ) {
-                SchedualPatientsTable["dialysis_before_weight"] =
-                  response.data.data.schedule[
-                    i
-                  ].assessment_before_dislysis.weight_before;
+              if(response.data.data.schedule[i].patient!=null){
+                 SchedualPatientsTable["dialysis_no"] = response.data.data.schedule[i].patient.dialysis_no;
+                 SchedualPatientsTable["name"] =  response.data.data.schedule[i].patient.name;
+                 SchedualPatientsTable["gender"] = response.data.data.schedule[i].patient.gender;
+                 SchedualPatientsTable["source"] = response.data.data.schedule[i].patient.source;
+                SchedualPatientsTable["patient_id"] = response.data.data.schedule[i].patient_id;
               }
-              if (
-                response.data.data.schedule[i].assessment_after_dislysis.id > 0
-              ) {
-                SchedualPatientsTable["dialysis_after_weight"] =
-                  response.data.data.schedule[
-                    i
-                  ].assessment_after_dislysis.weight_after;
+             
+              SchedualPatientsTable["number"] =  response.data.data.schedule[i].device_number.number;
+               
+              if(response.data.data.schedule[i].treatment_mode!=null){
+                SchedualPatientsTable["mode_name"] = response.data.data.schedule[i].treatment_mode.name;
+              }
+              if(response.data.data.schedule[i].prescription!=null){
+                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;  
+              }
+             
+              if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
+              }
+              if (response.data.data.schedule[i].assessment_after_dislysis !=null) {
+                SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
 
               SchedualPatientsTable.bp = [];