Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -1188,10 +1188,8 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
-                      </div>
-                      
+                      </div>                      
                     </div>
-
                   </td>
                 </tr>
                 <tr>
@@ -1233,12 +1231,13 @@
                           v-for="(monitor_record, j) in record.monitor_records"
                           :key="j"
                         >
+                        <!-- <td>{{ monitor_record.ultrafiltration_volume }}</td> -->
                           <td>
                             {{
                               getTime(monitor_record.operate_time, "{h}:{i}")
                             }}
                           </td>
-                          <td >
+                           <td >
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
@@ -1278,7 +1277,7 @@
                                 : ""
                             }}
                           </td>
-                          <td >
+                         <td >
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure
@@ -1303,7 +1302,7 @@
                             </span>
                            
                           </td>
-                          <td>
+                           <td>
                             {{
                               monitor_record.transmembrane_pressure
                                 ? monitor_record.transmembrane_pressure
@@ -1312,8 +1311,8 @@
                           </td>
                           <td >
                             {{
-                              monitor_record.filter_pressure
-                                ? monitor_record.filter_pressure
+                              monitor_record.ultrafiltration_volume
+                                ? monitor_record.ultrafiltration_volume
                                 : ""
                             }}
                           </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -1285,7 +1285,7 @@
                             }}
                           </span>
                         </td>
-                        <td width="50">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
+                        <td width="50">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume:""}}</td>
                         <td >
                           <span > {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                         </td>