Browse Source

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

XMLWAN 2 years ago
parent
commit
1e8d9afc2c

+ 4 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue View File

839
               {{ monitor.temperature ? monitor.temperature : "" }}
839
               {{ monitor.temperature ? monitor.temperature : "" }}
840
             </span>
840
             </span>
841
           </td>
841
           </td>
842
+          
843
+
842
           <td>
844
           <td>
843
             <span v-if="getTime(monitor.operate_time) != ''">
845
             <span v-if="getTime(monitor.operate_time) != ''">
844
-              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
846
+              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
845
             </span>
847
             </span>
846
           </td>
848
           </td>
847
-
848
           <td>
849
           <td>
849
             <span v-if="getTime(monitor.operate_time) != ''">
850
             <span v-if="getTime(monitor.operate_time) != ''">
850
-              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
851
+              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
851
             </span>
852
             </span>
852
           </td>
853
           </td>
853
 
854
 

+ 14 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue View File

1190
                         </td>
1190
                         </td>
1191
                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
1191
                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
1192
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
1192
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
1193
-                        <td width="50">电导度<br />(ms/cm)</td>
1193
+
1194
+                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
1195
+                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
1194
                         <td width="50">超滤量<br />(ml)</td>
1196
                         <td width="50">超滤量<br />(ml)</td>
1195
                         <td
1197
                         <td
1196
                           v-if="
1198
                           v-if="
1302
                         <td v-if="org_id == 9836">
1304
                         <td v-if="org_id == 9836">
1303
                           {{ monitor.temperature ? monitor.temperature : "" }}
1305
                           {{ monitor.temperature ? monitor.temperature : "" }}
1304
                         </td>
1306
                         </td>
1305
-                        <td v-if="org_id != 9538">
1307
+
1308
+
1309
+                        <td v-if="org_id != 9538 && org_id != 10121 && org_id != 9675&& org_id != 0">
1306
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
1310
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
1307
                         </td>
1311
                         </td>
1308
                         <td v-if="org_id == 9538">
1312
                         <td v-if="org_id == 9538">
1312
                               : ""
1316
                               : ""
1313
                           }}
1317
                           }}
1314
                         </td>
1318
                         </td>
1319
+                        <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
1320
+                          {{
1321
+                            monitor.blood_oxygen_saturation
1322
+                              ? monitor.blood_oxygen_saturation
1323
+                              : ""
1324
+                          }}
1325
+                        </td>
1315
                         <td
1326
                         <td
1316
                           v-if="
1327
                           v-if="
1317
                             (dialysisOrder &&
1328
                             (dialysisOrder &&
1318
                               monitor.operate_time > dialysisOrder.end_time) ||
1329
                               monitor.operate_time > dialysisOrder.end_time) ||
1330
+
1319
                             (dialysisOrder &&
1331
                             (dialysisOrder &&
1320
                               monitor.operate_time < dialysisOrder.start_time)
1332
                               monitor.operate_time < dialysisOrder.start_time)
1321
                           "
1333
                           "

+ 2 - 2
src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue View File

842
               <p style="height: 20px; line-height: 20px">ml</p>
842
               <p style="height: 20px; line-height: 20px">ml</p>
843
             </th>
843
             </th>
844
             <th style="width: 70px">
844
             <th style="width: 70px">
845
-              <p style="height: 20px; line-height: 20px">Kt/V</p>
846
-              <p style="height: 20px; line-height: 20px">ml</p>
845
+              <p style="height: 20px; line-height: 20px">KT/V</p>
846
+              <p style="height: 20px; line-height: 20px">&nbsp;</p>
847
             </th>
847
             </th>
848
             <th style="width: 40px">
848
             <th style="width: 40px">
849
               <p style="height: 20px; line-height: 20px">T</p>
849
               <p style="height: 20px; line-height: 20px">T</p>