修改

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1339,23 +1339,6 @@
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-                        <td
-                          v-if="
-                            org_id != 9538 &&
-                            org_id != 10121 &&
-                            org_id != 9675 &&
-                            org_id != 0
-                          "
-                        >
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
-                        </td>
-                        <td v-if="org_id == 9538">
-                          {{
-                            monitor.sodium_concentration
-                              ? monitor.sodium_concentration
-                              : ""
-                          }}
-                        </td>
                         <td
                           v-if="
                             org_id == 10121 || org_id == 9675 || org_id == 0
@@ -1367,32 +1350,33 @@
                               : ""
                           }}
                         </td>
+
+
                         <td
                           v-if="
-                            (dialysisOrder &&
-                              monitor.operate_time > dialysisOrder.end_time) ||
-                            (dialysisOrder &&
-                              monitor.operate_time < dialysisOrder.start_time)
+                            org_id != 9538 &&
+                            org_id != 10121 &&
+                            org_id != 9675 &&
+                            org_id != 0
                           "
                         >
+                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                        </td>
+
+                        <td v-if="org_id == 9538">
                           {{
-                            monitor.ultrafiltration_volume
-                              ? monitor.ultrafiltration_volume
+                            monitor.sodium_concentration
+                              ? monitor.sodium_concentration
                               : ""
                           }}
                         </td>
+                        
                         <td
-                          v-if="
-                            dialysisOrder &&
-                            monitor.operate_time <= dialysisOrder.end_time &&
-                            dialysisOrder &&
-                            monitor.operate_time >= dialysisOrder.start_time
-                          "
                         >
                           {{
                             monitor.ultrafiltration_volume
                               ? monitor.ultrafiltration_volume
-                              : "0"
+                              : ""
                           }}
                         </td>
                         <!-- <td style="width:50px">