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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1086,7 +1086,8 @@
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">
-                        计划超滤量：
+                        <span v-if="org_id!=10683">计划超滤量：</span>
+                        <span v-if="org_id==10683">预脱：</span>
                         <div
                           class="under_line"
                           style="width: 100px; text-align: center"
@@ -1103,7 +1104,8 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id ==10598">
-                        处方脱水量：
+                        <span v-if="org_id!=10683">计划超滤量：</span>
+                        <span v-if="org_id==10683">预脱：</span>
                         <div
                           class="under_line"
                           style="width: 100px; text-align: center"
@@ -1608,8 +1610,8 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</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 />(ml/h)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1692,14 +1694,14 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id != 10600">
+                          <td v-if="org_id != 10600 && org_id != 10683">
                             {{
                               monitor_record.blood_flow_volume
                                 ? monitor_record.blood_flow_volume
                                 : ""
                             }}
                           </td>
-                          <td width="50" v-if="org_id == 10600"><br />
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683"><br />
                             {{
                               monitor_record.ultrafiltration_rate
                                 ? monitor_record.ultrafiltration_rate

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -82,25 +82,25 @@
           <div class="inline_block" v-if="org_id!=10624">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10567 || org_id ==10206 || org_id ==10644 || org_id ==0 || org_id ==10633" >{{
+              <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ "/" }}</span>
             </div>
           </div>
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id ==10515 || org_id == 10567 || org_id ==10206 || org_id ==10644 || org_id ==0 || org_id ==10633">{{
+              <span>{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ "/" }}</span>
             </div>
           </div>
           <div class="inline_block">
@@ -1191,7 +1191,8 @@
                       kg
                     </div>
                     <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
-                      计划超滤量：
+                      <span v-if="org_id!=10683">计划超滤量：</span>
+                      <span v-if="org_id==10683">预脱：</span>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -1697,8 +1698,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 != 10600">超滤量<br />(ml)</td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</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 />
@@ -1812,7 +1813,7 @@
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
-                        <td v-if="org_id!=10600 && org_id!=10644">
+                        <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
                           <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
@@ -1821,7 +1822,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644"><br/>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683"><br/>
                            <span v-if="org_id!=10644">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</span> 
                            <span v-if="org_id==10644">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
                           </td>
@@ -2499,25 +2500,25 @@
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10624">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10206">{{
+              <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ "/" }}</span>
             </div>
             </div>
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10460 && org_id!=10624" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460 || org_id ==10206">{{
+              <span>{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ "/" }}</span>
             </div>
             </div>
             <div class="inline_block">