28169 преди 1 седмица
родител
ревизия
e825d6fc50

+ 11 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue Целия файл

@@ -427,18 +427,25 @@
427 427
                       </div>
428 428
                       <div class="inline_block" style="flex: 1">
429 429
                         体重增加:
430
+                      
430 431
                         <div class="under_line" style="width: 70px; text-align: center">
431
-                          <span v-if="record.lastafterweight.weight_after>0">{{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
432
+                          <span v-if="record.lastafterweight.weight_after>0">
433
+                            {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
432 434
                             ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
433 435
                             - record.lastafterweight.weight_after).toFixed(2): "/" 
434 436
                           }}
435 437
                           </span> 
436 438
 
437
-                          <span v-if="record.lastafterweight.weight_after<=0">{{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
439
+                          <span v-if="record.lastafterweight.weight_after<=0 && record.assessment_after_dislysis.last_after_weight>0">
440
+                            {{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
438 441
                             ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
439 442
                             - record.assessment_after_dislysis.last_after_weight).toFixed(2): "/" 
440 443
                           }}
441 444
                           </span> 
445
+
446
+                          <span v-if="record.lastafterweight.weight_after<=0 && record.assessment_after_dislysis.last_after_weight ==0">
447
+                              /
448
+                          </span> 
442 449
                         </div>
443 450
                         kg
444 451
                       </div>
@@ -446,8 +453,8 @@
446 453
                         超滤总量:
447 454
                         <div class="under_line" style="width: 100px; text-align: center">
448 455
                           {{
449
-                            record.prescription.target_ultrafiltration
450
-                              ? record.prescription.target_ultrafiltration
456
+                            record.prescription.prescription_water
457
+                              ? record.prescription.prescription_water
451 458
                               : "/"
452 459
                           }}
453 460
                         </div>

+ 14 - 5
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Целия файл

@@ -381,6 +381,8 @@
381 381
                       上次透后体重:
382 382
                       <div class="under_line" style="width: 50px; text-align: center">
383 383
                         <!-- {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}} -->
384
+                       
385
+                        
384 386
                         <span v-if="lastafterdialysis.weight_after>0">{{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}</span> 
385 387
                         <span v-if="lastafterdialysis.weight_after<=0">{{afterdialysis.last_after_weight?afterdialysis.last_after_weight:"未称重"}}</span> 
386 388
                       </div>
@@ -406,8 +408,15 @@
406 408
                       <div class="under_line" style="width: 70px; text-align: center">
407 409
                         <span>
408 410
                           <!-- {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}} -->
409
-                          <span v-if="lastafterdialysis.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}</span> 
410
-                          <span v-if="lastafterdialysis.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span> 
411
+                          <span v-if="lastafterdialysis.weight_after>0"
412
+                            >{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}
413
+                          </span> 
414
+                          <span v-if="lastafterdialysis.weight_after<=0 && afterdialysis.last_after_weight>0">
415
+                            {{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}
416
+                          </span> 
417
+                          <span v-if="lastafterdialysis.weight_after<=0 && afterdialysis.last_after_weight==0">
418
+                            /
419
+                          </span> 
411 420
                         </span>
412 421
                       </div>
413 422
                       kg
@@ -416,8 +425,8 @@
416 425
                       超滤总量:
417 426
                       <div class="under_line" style="width: 60px; text-align: center">
418 427
                         {{
419
-                          prescription.target_ultrafiltration
420
-                            ? prescription.target_ultrafiltration
428
+                          prescription.prescription_water
429
+                            ? prescription.prescription_water
421 430
                             : "/"
422 431
                         }}
423 432
                       </div>
@@ -1743,7 +1752,7 @@ export default {
1743 1752
       } if (this.predialysis.weight_before == 0) {
1744 1753
         const obj19 ='透前体重'
1745 1754
         checkDate.push(obj19)
1746
-      } if (this.prescription.target_ultrafiltration == 0) {
1755
+      } if (this.prescription.prescription_water == 0) {
1747 1756
         const obj20 ='超滤总量'
1748 1757
         checkDate.push(obj20)
1749 1758
       } if (this.prescription.calcium == 0) {