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/template/DialysisPrintOrderSix.vue

@@ -584,7 +584,8 @@
                         </td>
                         <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
                         <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
-                        <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
+                        <td><template  v-if="org_id == 10223">{{ monitor.conductivity ? monitor.conductivity : "" }}</template>
+                        <template v-else>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}<template>
                         </td>
                         <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}