Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -498,12 +498,12 @@
                   <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
                   <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
                   <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
-                  <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time )" > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
-                  <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
+                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
+                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
                   <!--<td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>-->
                   <!--<td> {{ monitor.sodium_concentration ? monitor.sodium_concentration : ""  }} </td>-->
-                  <td v-if="dialysisOrder && monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
-                  <td v-if="dialysisOrder && monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
+                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
+                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
                   <td> {{ monitor.heparin ? monitor.heparin : "" }} </td>
@@ -1255,7 +1255,6 @@
           return ''
         }
         if (id in this.operatorMaps) {
-          console.log(this.operatorMaps[id].url)
           return this.operatorMaps[id].url
         } else {
           return ''