Browse Source

修改打印

csx 6 years ago
parent
commit
5f167300e5

+ 17 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue View File

@@ -430,6 +430,15 @@
430 430
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 3)"></check-box>
431 431
                     </div>
432 432
 
433
+
434
+                    <div class="inline_block" style="margin-left: 30px;">
435
+                      实际超滤量:
436
+                      <div class="under_line" style="width: 50px;">
437
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:''}}
438
+                      </div>
439
+                      L
440
+                    </div>
441
+
433 442
                   </div>
434 443
 
435 444
                   <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -671,11 +680,11 @@
671 680
                     <div class="inline_block" style="margin-left:20px;">
672 681
                       治疗时间:
673 682
                       <div class="under_line" style="width: 30px;">
674
-                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:''}}
683
+                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:'0'}}
675 684
                       </div>
676 685
                       h
677 686
                       <div class="under_line" style="width: 30px;">
678
-                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:''}}
687
+                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:'0'}}
679 688
                       </div>
680 689
                       min
681 690
                     </div>
@@ -1097,7 +1106,12 @@
1097 1106
                     id: this.doctor_advices[index].id,
1098 1107
                     parent_id: this.doctor_advices[index].parent_id,
1099 1108
                     children: this.doctor_advices[index].children,
1100
-                    remark: this.doctor_advices[index].remark
1109
+                    remark: this.doctor_advices[index].remark,
1110
+
1111
+                    execution_staff: this.doctor_advices[index].execution_staff,
1112
+                    checker: this.doctor_advices[index].checker,
1113
+                    advice_doctor: this.doctor_advices[index].advice_doctor,
1114
+
1101 1115
 
1102 1116
                   }
1103 1117
                   doctor_advice['isShow'] = 1

+ 16 - 5
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -625,7 +625,7 @@
625 625
                     <td width="70">
626 626
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
627 627
                     </td>
628
-                    <td width="20">ml</td>
628
+                    <td width="20">L</td>
629 629
                     <td></td>
630 630
                     <td width="60">透后体重</td>
631 631
                     <td width="50">
@@ -1102,6 +1102,7 @@
1102 1102
 
1103 1103
                     <td></td>
1104 1104
 
1105
+
1105 1106
                     <td width="65">透析频次:</td>
1106 1107
                     <td width="80">
1107 1108
                       <div class="under-line">&nbsp;{{predialysis.dialysis_count?predialysis.dialysis_count:''}}</div>
@@ -1211,6 +1212,7 @@
1211 1212
                     </td>
1212 1213
 
1213 1214
                     <td></td>
1215
+
1214 1216
                   </tr>
1215 1217
                   </tbody>
1216 1218
                 </table>
@@ -1610,9 +1612,15 @@
1610 1612
                         &nbsp;
1611 1613
                       </div>
1612 1614
                     </td>
1615
+                    <td width="100">实际超滤量:</td>
1616
+                    <td width="40">
1617
+                      <div class="under-line">&nbsp;
1618
+                        <span>{{afterdialysis&&afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</span>
1619
+                      </div>
1620
+                    </td>
1621
+                    <td width="10">L</td>
1613 1622
                     <td></td>
1614 1623
 
1615
-
1616 1624
                   </tr>
1617 1625
                   </tbody>
1618 1626
                 </table>
@@ -1939,11 +1947,11 @@
1939 1947
                     </td>
1940 1948
                     <td width="64">治疗时间:</td>
1941 1949
                     <td width="40">
1942
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:''}}</div>
1950
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_hour?prescription.dialysis_duration_hour:'0'}}</div>
1943 1951
                     </td>
1944 1952
                     <td width="10">h</td>
1945 1953
                     <td width="40">
1946
-                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:''}}</div>
1954
+                      <div class="under-line">&nbsp;{{prescription.dialysis_duration_minute?prescription.dialysis_duration_minute:'0'}}</div>
1947 1955
                     </td>
1948 1956
                     <td width="35">min</td>
1949 1957
 
@@ -2590,7 +2598,10 @@
2590 2598
                     id: this.doctor_advices[index].id,
2591 2599
                     parent_id: this.doctor_advices[index].parent_id,
2592 2600
                     children: this.doctor_advices[index].children,
2593
-                    remark: this.doctor_advices[index].remark
2601
+                    remark: this.doctor_advices[index].remark,
2602
+                    execution_staff: this.doctor_advices[index].execution_staff,
2603
+                    checker: this.doctor_advices[index].checker,
2604
+                    advice_doctor: this.doctor_advices[index].advice_doctor,
2594 2605
 
2595 2606
                   }
2596 2607
                   doctor_advice['isShow'] = 1