浏览代码

no message

张保健 6 年前
父节点
当前提交
a921b39f5a
共有 2 个文件被更改,包括 2241 次插入14 次删除
  1. 24 13
      src/xt_pages/dialysis/batch_print/batch_print_order_other.vue
  2. 2217 1
      src/xt_pages/dialysis/dialysisPrintOrder.vue

+ 24 - 13
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue 查看文件

38
             <div class="inline_block" style="margin-left: 25px;">
38
             <div class="inline_block" style="margin-left: 25px;">
39
               住院号/ID号:
39
               住院号/ID号:
40
               <div class="under_line" style="width: 100px;">
40
               <div class="under_line" style="width: 100px;">
41
-                {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
42
               </div>
41
               </div>
43
             </div>
42
             </div>
44
           </div>
43
           </div>
78
 
77
 
79
                     <div class="inline_block" style="margin-left: 30px;">
78
                     <div class="inline_block" style="margin-left: 30px;">
80
                       透析机编号:
79
                       透析机编号:
81
-                      <div class="under_line" style="width: 50px;">{{''}}</div>
80
+                      <div class="under_line" style="width: 100px;">{{record.dialysis_order&&record.dialysis_order.device_number&&record.dialysis_order.device_number.number.length > 0?record.dialysis_order.device_number.number:''}}</div>
82
                       型号
81
                       型号
83
-                      <div class="under_line" style="width: 50px;">{{''}}</div>
82
+                      <div class="under_line" style="width: 100px;">{{record.assessment_before_dislysis&&record.assessment_before_dislysis.machine_type&&record.assessment_before_dislysis.machine_type.length > 0 ? record.assessment_before_dislysis.machine_type:''}}</div>
84
                     </div>
83
                     </div>
85
 
84
 
86
                   </div>
85
                   </div>
431
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 3)"></check-box>
430
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 3)"></check-box>
432
                     </div>
431
                     </div>
433
 
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
+
434
                   </div>
442
                   </div>
435
 
443
 
436
                   <div class="row" style="padding: 2px 0;line-height:19px;">
444
                   <div class="row" style="padding: 2px 0;line-height:19px;">
531
                     <div class="inline_block">
539
                     <div class="inline_block">
532
                       &emsp;核对时间:
540
                       &emsp;核对时间:
533
                       <div class="under_line" style="width: 200px;">
541
                       <div class="under_line" style="width: 200px;">
534
-                        {{record.check?getTime(record.check.updated_time,'{y}年{m}月{d}日 {h}时'):''}}
542
+                        {{record.check&&record.check.modifier> 0?getTime(record.check.check_time,'{y}年{m}月{d}日 {h}时'):''}}
535
                       </div>
543
                       </div>
536
                     </div>
544
                     </div>
537
 
545
 
585
                     <div class="inline_block">
593
                     <div class="inline_block">
586
                       &emsp;时间:
594
                       &emsp;时间:
587
                       <div class="under_line" style="width: 200px;">
595
                       <div class="under_line" style="width: 200px;">
588
-                        {{record.check?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
596
+                        {{record.dialysis_order?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
589
                       </div>
597
                       </div>
590
                     </div>
598
                     </div>
591
 
599
 
631
               <div class="inline_block" style="margin-left:25px;">
639
               <div class="inline_block" style="margin-left:25px;">
632
                 住院号/ID号:
640
                 住院号/ID号:
633
                 <div class="under_line" style="width: 120px;">
641
                 <div class="under_line" style="width: 120px;">
634
-                  {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no
635
-                  }}
636
                 </div>
642
                 </div>
637
               </div>
643
               </div>
638
             </div>
644
             </div>
674
                     <div class="inline_block" style="margin-left:20px;">
680
                     <div class="inline_block" style="margin-left:20px;">
675
                       治疗时间:
681
                       治疗时间:
676
                       <div class="under_line" style="width: 30px;">
682
                       <div class="under_line" style="width: 30px;">
677
-                        {{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'}}
678
                       </div>
684
                       </div>
679
                       h
685
                       h
680
                       <div class="under_line" style="width: 30px;">
686
                       <div class="under_line" style="width: 30px;">
681
-                        {{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'}}
682
                       </div>
688
                       </div>
683
                       min
689
                       min
684
                     </div>
690
                     </div>
1039
           for (const recordIndex in this.records) {
1045
           for (const recordIndex in this.records) {
1040
             this.advice_groups = []
1046
             this.advice_groups = []
1041
             var dlegh = 0
1047
             var dlegh = 0
1042
-            if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
1043
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
1048
+            if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 7) {
1049
+              dlegh = 7 - this.records[recordIndex].monitor_records.length
1044
             } else {
1050
             } else {
1045
-              dlegh = 8
1051
+              dlegh = 7
1046
             }
1052
             }
1047
             if (dlegh > 0) {
1053
             if (dlegh > 0) {
1048
               if (typeof (this.records[recordIndex].monitor_records) === 'undefined' || this.records[recordIndex].monitor_records == null) {
1054
               if (typeof (this.records[recordIndex].monitor_records) === 'undefined' || this.records[recordIndex].monitor_records == null) {
1100
                     id: this.doctor_advices[index].id,
1106
                     id: this.doctor_advices[index].id,
1101
                     parent_id: this.doctor_advices[index].parent_id,
1107
                     parent_id: this.doctor_advices[index].parent_id,
1102
                     children: this.doctor_advices[index].children,
1108
                     children: this.doctor_advices[index].children,
1103
-                    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
+
1104
 
1115
 
1105
                   }
1116
                   }
1106
                   doctor_advice['isShow'] = 1
1117
                   doctor_advice['isShow'] = 1

文件差异内容过多而无法显示
+ 2217 - 1
src/xt_pages/dialysis/dialysisPrintOrder.vue