54

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -839,15 +839,16 @@
               {{ monitor.temperature ? monitor.temperature : "" }}
             </span>
           </td>
+          
+
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
+              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
             </span>
           </td>
-
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
             </span>
           </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1190,7 +1190,9 @@
                         </td>
                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                        <td width="50">电导度<br />(ms/cm)</td>
+
+                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td
                           v-if="
@@ -1302,7 +1304,9 @@
                         <td v-if="org_id == 9836">
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
-                        <td v-if="org_id != 9538">
+
+
+                        <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">
@@ -1312,10 +1316,18 @@
                               : ""
                           }}
                         </td>
+                        <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                          {{
+                            monitor.blood_oxygen_saturation
+                              ? monitor.blood_oxygen_saturation
+                              : ""
+                          }}
+                        </td>
                         <td
                           v-if="
                             (dialysisOrder &&
                               monitor.operate_time > dialysisOrder.end_time) ||
+
                             (dialysisOrder &&
                               monitor.operate_time < dialysisOrder.start_time)
                           "