Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
               :key="index"
               class="under_line"
               v-if="receiverTreatmentAccess.consciousness == item.id"
-              style="width: 180px; text-align: left"
+              
+              style="width: 100px; text-align: left"
+
             >
               {{ item.name }}
             </div>
           
           <div class="inline_block" style="margin-left: 10px;">
             诊断：
-            <div class="under_line" style="width: 640px;text-align: left;word-wrap: break-word;white-space: inherit;">
+            <div class="under_line" style="width: 500px;text-align: left;word-wrap: break-word;white-space: inherit;">
               {{ patientInfo.diagnose }}
             </div>
           </div>
                       <div class="inline_block" style="flex: 1">
                       病人食欲：
                       <div
-                        v-for="(item, index) in appetite_arr"
-                        :key="index"
+                        
                         class="under_line"
-                        v-if="receiverTreatmentAccess.appetite == item.id"
-                        style="width: 180px; text-align: left"
+                        style="width: 135px; text-align: left"
                       >
-                        {{ item.name ? item.name : '/' }}
+                        11
                       </div>
                     </div>
 
                     <div class="inline_block" style="margin-left:10px;flex:1.5;">
                       BP：
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "/" }}
+                        {{ afterBP.systolic_blood_pressure ? afterBP.systolic_blood_pressure : "/" }}
                       </div>
                       /
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "/" }}
+                        {{ afterBP.diastolic_blood_pressure ? afterBP.diastolic_blood_pressure : "/" }}
                       </div>
                       mmHg
                     </div>
       jilurow: 0,
       advice_jilurow: 0,
       loading: false,
+      afterBP:{},
       orgname: '',
       patientInfo_gender_1: false,
       patientInfo_gender_2: false,
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis
         console.log("上次透后体重",this.lastafterdialysis.weight_after)
         this.operators = response.data.data.operators
-        console.log('operators', this.operators)
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null
 
         this.advices = response.data.data.advices
         this.tableAdvice = response.data.data.advices;
-        console.log('医嘱数据2222222222', this.advices)
+        console.log('医嘱数据', this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info
             }
           }
         }
+        let arr = this.monitors.length
+        this.afterBP = this.monitors[arr-1]
 
         var tempmonitorflag = true
         for (let index = 0; index < this.monitors.length; index++) {
     }
 
     const xtdate = this.$route.query && this.$route.query.xtdate
-    console.log('xtdate', xtdate)
+    
     const xtno = this.$route.query && this.$route.query.xtno
-    console.log('xtno', xtno)
+    
     if (
       typeof xtdate === 'string' &&
       xtdate.length > 0 &&

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no }}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>