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/batch_print/batch_print_order_six.vue

                           class="under_line"
                           style="width: 100px;text-align: center"
                         >
-                          {{
+                        <span v-if="org_id == 10290">{{record.lastafterweight.weight_after}}</span>
+                        <span v-else>{{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis
                               .weight_after_last_transparency
                                       .additional_weight
                                 ).toFixed(1)
                               : "未称重"
-                          }}
+                          }}</span>  
                         </div>
                         kg
                       </div>

src/xt_pages/dialysis/bloodPresssWatch.vue

               if(response.data.data.schedule[i].monitoring_record && response.data.data.schedule[i].monitoring_record.length > 0){
                 for (let a = 0;a < response.data.data.schedule[i].monitoring_record.length;a++) {
                 const bp = {};
-                bp["value"] =
-                  response.data.data.schedule[i].monitoring_record[
-                    a
-                  ].systolic_blood_pressure.toString() +
-                  "/" +
-                  response.data.data.schedule[i].monitoring_record[
-                    a
-                  ].diastolic_blood_pressure.toString();
-
-                 SchedualPatientsTable.bp.push(bp);
+                bp["value"] =response.data.data.schedule[i].monitoring_record[a].systolic_blood_pressure.toString() +"/" +response.data.data.schedule[i].monitoring_record[a].diastolic_blood_pressure.toString();
+                SchedualPatientsTable.bp.push(bp);
                }
               }
              
       });
     },
     getValue: function(val) {
+      
       if (val != undefined) {
         return val.value;
       } else {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                     <div class="inline_block" style="flex:1;">
                       上次透后体重：
                       <div class="under_line" style="width: 100px;text-align: center">
-                        {{predialysis.weight_after_last_transparency?predialysis.weight_after_last_transparency:'未称重'}}
+                        <span v-if="org_id == 10290">{{lastafterdialysis.weight_after}}</span>
+                       <span v-else>{{predialysis.weight_after_last_transparency?predialysis.weight_after_last_transparency:'未称重'}}</span> 
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
                       </div>
                       kg
         this.afterdialysis = response.data.data.AssessmentAfterDislysis
         // console.log('透后体重', this.afterdialysis)
         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 =
       'vascular_access_desc'
     )
     this.org_id = this.$store.getters.xt_user.org.id
-    console.log('=====', this.org_id)
+   
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

                     <td width="50">去向:</td>
                       <td width="200">
                         <div style="display:flex;justify-content:space-between;">
-                          <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
+                          <!-- <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box> -->
+
+                          <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="离院"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                         </div>
                       </td>
                       <td>
       }
     },
     created() {
+      console.log("患者去向",   this.$store.getters.patient_gose)
+
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       // this.orgname = "遂溪方济医院";

src/xt_pages/stock/drugs/inventoryPrint.vue

                         <td>{{item.specification_name}}</td>
                         <td>{{item.batch_number}}</td>
                         <td>{{getTime(item.product_date)}}</td>
-                        <td>{{getTime(item.product_date)}}</td>
+                        <td>{{getTime(item.expiry_date)}}</td>
                         <td>{{getManufacturerName(item.manufacturer)}}</td>
                         <td>{{item.number}}</td>
                         <td>{{item.max_unit}}</td>