Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1491,7 +1491,8 @@
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
-                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id == 10600">超滤率<br/></td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           置换量<br />(ml)
@@ -1603,17 +1604,10 @@
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10600"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
-                        <!-- <td style="width:50px">
-                          <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
-                            {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
-                          </span>
-                          <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))">
-                            {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
-                          </span>
-                        </td> -->
+                        <td width="50" v-if="org_id == 10600">超滤率<br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
                         <td
                           v-if="
                             (prescription.mode_id == 2 ||