Explorar el Código

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

yq1 hace 11 meses
padre
commit
e2f587d659

+ 8 - 6
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Ver fichero

@@ -1086,7 +1086,8 @@
1086 1086
                         kg
1087 1087
                       </div>
1088 1088
                       <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">
1089
-                        计划超滤量:
1089
+                        <span v-if="org_id!=10683">计划超滤量:</span>
1090
+                        <span v-if="org_id==10683">预脱:</span>
1090 1091
                         <div
1091 1092
                           class="under_line"
1092 1093
                           style="width: 100px; text-align: center"
@@ -1103,7 +1104,8 @@
1103 1104
                       </div>
1104 1105
 
1105 1106
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id ==10598">
1106
-                        处方脱水量:
1107
+                        <span v-if="org_id!=10683">计划超滤量:</span>
1108
+                        <span v-if="org_id==10683">预脱:</span>
1107 1109
                         <div
1108 1110
                           class="under_line"
1109 1111
                           style="width: 100px; text-align: center"
@@ -1608,8 +1610,8 @@
1608 1610
                           置换液的速度<br />(ml/h)
1609 1611
                           </td>
1610 1612
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
1611
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600">超滤量<br />(ml)</td>
1612
-                          <td width="50" v-if="org_id == 10600">超滤率<br />(ml/h)</td>
1613
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
1614
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683">超滤率<br />(ml/h)</td>
1613 1615
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
1614 1616
                           <td
1615 1617
                             v-if="
@@ -1692,14 +1694,14 @@
1692 1694
                                 : ""
1693 1695
                             }}
1694 1696
                           </td>
1695
-                          <td v-if="org_id != 10600">
1697
+                          <td v-if="org_id != 10600 && org_id != 10683">
1696 1698
                             {{
1697 1699
                               monitor_record.blood_flow_volume
1698 1700
                                 ? monitor_record.blood_flow_volume
1699 1701
                                 : ""
1700 1702
                             }}
1701 1703
                           </td>
1702
-                          <td width="50" v-if="org_id == 10600"><br />
1704
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683"><br />
1703 1705
                             {{
1704 1706
                               monitor_record.ultrafiltration_rate
1705 1707
                                 ? monitor_record.ultrafiltration_rate

+ 14 - 13
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Ver fichero

@@ -82,25 +82,25 @@
82 82
           <div class="inline_block" v-if="org_id!=10624">
83 83
             病区:
84 84
             <div class="under_line" style="width: 50px; text-align: center">
85
-              <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" >{{
85
+              <span>{{
86 86
                 patientInfo.DialysisSchedule.device_zone.name
87 87
                   ? patientInfo.DialysisSchedule.device_zone.name
88 88
                   : ""
89 89
               }}</span>
90
-              <span v-else>{{ "/" }}</span>
90
+              <span>{{ "/" }}</span>
91 91
             </div>
92 92
           </div>
93 93
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
94 94
             床号:
95 95
             <div class="under_line" style="width: 50px; text-align: center">
96
-              <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">{{
96
+              <span>{{
97 97
                 dialysisOrder &&
98 98
                 dialysisOrder.DeviceNumber &&
99 99
                 dialysisOrder.DeviceNumber.number.length > 0
100 100
                   ? dialysisOrder.DeviceNumber.number
101 101
                   : patientInfo.DialysisSchedule.device_number.number
102 102
               }}</span>
103
-              <span v-else>{{ "/" }}</span>
103
+              <span>{{ "/" }}</span>
104 104
             </div>
105 105
           </div>
106 106
           <div class="inline_block">
@@ -1191,7 +1191,8 @@
1191 1191
                       kg
1192 1192
                     </div>
1193 1193
                     <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
1194
-                      计划超滤量:
1194
+                      <span v-if="org_id!=10683">计划超滤量:</span>
1195
+                      <span v-if="org_id==10683">预脱:</span>
1195 1196
                       <div
1196 1197
                         class="under_line"
1197 1198
                         style="width: 100px; text-align: center"
@@ -1697,8 +1698,8 @@
1697 1698
                         </td>
1698 1699
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
1699 1700
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
1700
-                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600">超滤量<br />(ml)</td>
1701
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598">超滤率<br/>(ml/h)</td>
1701
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">超滤量<br />(ml)</td>
1702
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
1702 1703
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
1703 1704
                         <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">
1704 1705
                           置换量<br />
@@ -1812,7 +1813,7 @@
1812 1813
                         <td v-if="org_id == 10375 || org_id == 0"><br />
1813 1814
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
1814 1815
                         </td>
1815
-                        <td v-if="org_id!=10600 && org_id!=10644">
1816
+                        <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
1816 1817
                           <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1817 1818
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
1818 1819
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
@@ -1821,7 +1822,7 @@
1821 1822
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
1822 1823
                            </span>
1823 1824
                         </td>
1824
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644"><br/>
1825
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683"><br/>
1825 1826
                            <span v-if="org_id!=10644">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</span> 
1826 1827
                            <span v-if="org_id==10644">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
1827 1828
                           </td>
@@ -2499,25 +2500,25 @@
2499 2500
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10624">
2500 2501
               病区:
2501 2502
               <div class="under_line" style="width: 50px; text-align: center">
2502
-              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10206">{{
2503
+              <span>{{
2503 2504
                 patientInfo.DialysisSchedule.device_zone.name
2504 2505
                   ? patientInfo.DialysisSchedule.device_zone.name
2505 2506
                   : ""
2506 2507
               }}</span>
2507
-              <span v-else>{{ "/" }}</span>
2508
+              <span>{{ "/" }}</span>
2508 2509
             </div>
2509 2510
             </div>
2510 2511
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10460 && org_id!=10624" >
2511 2512
               床号:
2512 2513
               <div class="under_line" style="width: 50px; text-align: center">
2513
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460 || org_id ==10206">{{
2514
+              <span>{{
2514 2515
                 dialysisOrder &&
2515 2516
                 dialysisOrder.DeviceNumber &&
2516 2517
                 dialysisOrder.DeviceNumber.number.length > 0
2517 2518
                   ? dialysisOrder.DeviceNumber.number
2518 2519
                   : patientInfo.DialysisSchedule.device_number.number
2519 2520
               }}</span>
2520
-              <span v-else>{{ "/" }}</span>
2521
+              <span>{{ "/" }}</span>
2521 2522
             </div>
2522 2523
             </div>
2523 2524
             <div class="inline_block">