提交代码

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>
@@ -531,7 +530,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 +584,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 +630,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>
@@ -1040,10 +1037,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) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1068,9 +1068,8 @@
 
               <td width="10">&nbsp;</td>
               <td width="90">住院号/ID号:</td>
-              <td width="90">
-                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
-                  /{{patientInfo.dialysis_no}}
+              <td width="100">
+                <div  class="under-line" style="padding-top: 30px">
                 </div>
               </td>
             </tr>
@@ -1112,11 +1111,11 @@
                     <td></td>
                     <td width="80">透析机编号:</td>
                     <td width="100">
-                      <div class="under-line">&nbsp;{{''}}</div>
+                      <div class="under-line">&nbsp;{{dialysisOrder&&dialysisOrder.DeviceNumber?dialysisOrder.DeviceNumber.number:''}}</div>
                     </td>
                     <td width="35">型号</td>
-                    <td width="100">
-                      <div class="under-line">&nbsp;{{''}}</div>
+                    <td width="140">
+                      <div class="under-line">&nbsp;{{predialysis&&predialysis.machine_type?predialysis.machine_type:''}}</div>
                     </td>
                   </tr>
                   </tbody>
@@ -1751,7 +1750,7 @@
 
                     <td width="60">核对时间:</td>
                     <td width="200">
-                      <div class="under-line">{{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时')}}</div>
+                      <div class="under-line">{{check&&check.modifier>0 ? getTime(check.check_time,'{y}年{m}月{d}日 {h}时'):''}}</div>
 
                     </td>
 
@@ -1872,8 +1871,8 @@
               <td width="10">&nbsp;</td>
               <td width="100">住院号/ID号:</td>
               <td width="90">
-                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
-                  /{{patientInfo.dialysis_no}}
+                <div class="under-line" style="padding-top: 30px">
+
                 </div>
               </td>