Browse Source

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

28169 1 year ago
parent
commit
7ece120eb9

+ 7 - 8
src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue View File

1188
                         <span v-if="record.prescription.anticoagulant == 1"
1188
                         <span v-if="record.prescription.anticoagulant == 1"
1189
                           >mg</span
1189
                           >mg</span
1190
                         >
1190
                         >
1191
-                      </div>
1192
-                      
1191
+                      </div>                      
1193
                     </div>
1192
                     </div>
1194
-
1195
                   </td>
1193
                   </td>
1196
                 </tr>
1194
                 </tr>
1197
                 <tr>
1195
                 <tr>
1233
                           v-for="(monitor_record, j) in record.monitor_records"
1231
                           v-for="(monitor_record, j) in record.monitor_records"
1234
                           :key="j"
1232
                           :key="j"
1235
                         >
1233
                         >
1234
+                        <!-- <td>{{ monitor_record.ultrafiltration_volume }}</td> -->
1236
                           <td>
1235
                           <td>
1237
                             {{
1236
                             {{
1238
                               getTime(monitor_record.operate_time, "{h}:{i}")
1237
                               getTime(monitor_record.operate_time, "{h}:{i}")
1239
                             }}
1238
                             }}
1240
                           </td>
1239
                           </td>
1241
-                          <td >
1240
+                           <td >
1242
                             {{
1241
                             {{
1243
                               monitor_record.dialysate_temperature
1242
                               monitor_record.dialysate_temperature
1244
                                 ? monitor_record.dialysate_temperature
1243
                                 ? monitor_record.dialysate_temperature
1278
                                 : ""
1277
                                 : ""
1279
                             }}
1278
                             }}
1280
                           </td>
1279
                           </td>
1281
-                          <td >
1280
+                         <td >
1282
                             {{
1281
                             {{
1283
                               monitor_record.arterial_pressure
1282
                               monitor_record.arterial_pressure
1284
                                 ? monitor_record.arterial_pressure
1283
                                 ? monitor_record.arterial_pressure
1303
                             </span>
1302
                             </span>
1304
                            
1303
                            
1305
                           </td>
1304
                           </td>
1306
-                          <td>
1305
+                           <td>
1307
                             {{
1306
                             {{
1308
                               monitor_record.transmembrane_pressure
1307
                               monitor_record.transmembrane_pressure
1309
                                 ? monitor_record.transmembrane_pressure
1308
                                 ? monitor_record.transmembrane_pressure
1312
                           </td>
1311
                           </td>
1313
                           <td >
1312
                           <td >
1314
                             {{
1313
                             {{
1315
-                              monitor_record.filter_pressure
1316
-                                ? monitor_record.filter_pressure
1314
+                              monitor_record.ultrafiltration_volume
1315
+                                ? monitor_record.ultrafiltration_volume
1317
                                 : ""
1316
                                 : ""
1318
                             }}
1317
                             }}
1319
                           </td>
1318
                           </td>

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue View File

1285
                             }}
1285
                             }}
1286
                           </span>
1286
                           </span>
1287
                         </td>
1287
                         </td>
1288
-                        <td width="50">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
1288
+                        <td width="50">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume:""}}</td>
1289
                         <td >
1289
                         <td >
1290
                           <span > {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
1290
                           <span > {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
1291
                         </td>
1291
                         </td>