no message

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -38,7 +38,6 @@
             <div class="inline_block" style="margin-left: 25px;">
               住院号/ID号：
               <div class="under_line" style="width: 100px;">
-                {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
               </div>
             </div>
           </div>
@@ -78,9 +77,9 @@
 
                     <div class="inline_block" style="margin-left: 30px;">
                       透析机编号：
-                      <div class="under_line" style="width: 50px;">{{''}}</div>
+                      <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>
                       型号
-                      <div class="under_line" style="width: 50px;">{{''}}</div>
+                      <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>
                     </div>
 
                   </div>
@@ -431,6 +430,15 @@
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 3)"></check-box>
                     </div>
 
+
+                    <div class="inline_block" style="margin-left: 30px;">
+                      实际超滤量：
+                      <div class="under_line" style="width: 50px;">
+                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:''}}
+                      </div>
+                      L
+                    </div>
+
                   </div>
 
                   <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -531,7 +539,7 @@
                     <div class="inline_block">
                       &emsp;核对时间：
                       <div class="under_line" style="width: 200px;">
-                        {{record.check?getTime(record.check.updated_time,'{y}年{m}月{d}日 {h}时'):''}}
+                        {{record.check&&record.check.modifier> 0?getTime(record.check.check_time,'{y}年{m}月{d}日 {h}时'):''}}
                       </div>
                     </div>
 
@@ -585,7 +593,7 @@
                     <div class="inline_block">
                       &emsp;时间：
                       <div class="under_line" style="width: 200px;">
-                        {{record.check?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                        {{record.dialysis_order?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
                       </div>
                     </div>
 
@@ -631,8 +639,6 @@
               <div class="inline_block" style="margin-left:25px;">
                 住院号/ID号：
                 <div class="under_line" style="width: 120px;">
-                  {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no
-                  }}
                 </div>
               </div>
             </div>
@@ -674,11 +680,11 @@
                     <div class="inline_block" style="margin-left:20px;">
                       治疗时间：
                       <div class="under_line" style="width: 30px;">
-                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:''}}
+                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:'0'}}
                       </div>
                       h
                       <div class="under_line" style="width: 30px;">
-                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:''}}
+                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:'0'}}
                       </div>
                       min
                     </div>
@@ -1039,10 +1045,10 @@
           for (const recordIndex in this.records) {
             this.advice_groups = []
             var dlegh = 0
-            if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
+            if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 7) {
+              dlegh = 7 - this.records[recordIndex].monitor_records.length
             } else {
-              dlegh = 8
+              dlegh = 7
             }
             if (dlegh > 0) {
               if (typeof (this.records[recordIndex].monitor_records) === 'undefined' || this.records[recordIndex].monitor_records == null) {
@@ -1100,7 +1106,12 @@
                     id: this.doctor_advices[index].id,
                     parent_id: this.doctor_advices[index].parent_id,
                     children: this.doctor_advices[index].children,
-                    remark: this.doctor_advices[index].remark
+                    remark: this.doctor_advices[index].remark,
+
+                    execution_staff: this.doctor_advices[index].execution_staff,
+                    checker: this.doctor_advices[index].checker,
+                    advice_doctor: this.doctor_advices[index].advice_doctor,
+
 
                   }
                   doctor_advice['isShow'] = 1