518合并代码

src/api/config.js

@@ -194,3 +194,11 @@ export function changeAdviceConfig(params) {
     params: params
   })
 }
+
+export function changePrescriptionConfig(params) {
+  return request({
+    url: '/api/changeprescriptionconfig',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/data/basicConfig.vue

@@ -25,6 +25,8 @@
           <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
           <p style="margin-top:20px;">门诊处方和临时医嘱同步到透析医嘱：
           <el-switch v-model="is_open_advice_xt_his" @change="changeFuncSix"></el-switch>
+          <p style="margin-top:20px;">是否出库：
+          <el-switch v-model="is_open_prescription_xt_his" @change="changeFuncSeven"></el-switch>
           </p>
         </div>
 
@@ -92,7 +94,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -112,6 +114,7 @@ export default {
       is_open_xt_his_project: false,
       is_open_is_type:false,
       is_open_advice_xt_his:false,
+      is_open_prescription_xt_his:false,
     };
   },
   methods: {
@@ -145,6 +148,12 @@ export default {
               this.is_open_advice_xt_his = false
             }
 
+            if(response.data.data.is_prescription_advice == 1){
+               this.is_open_prescription_xt_his = true
+            }else{
+              this.is_open_advice_xt_his = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -348,6 +357,24 @@ export default {
           this.$message.success("保存成功!")
          }
       })
+    },
+    changeFuncSeven(){
+      var is_open_prescription_xt_his = 2
+      if(this.is_open_advice_xt_his == false){
+        is_open_prescription_xt_his = 2
+      }
+      if(this.is_open_advice_xt_his == true){
+        is_open_prescription_xt_his = 2
+      }
+      var params = {
+        is_open_prescription_xt_his:is_open_prescription_xt_his,
+      }
+      changePrescriptionConfig(params).then(response=>{
+          if(response.data.state == 1){
+            var msg =  response.data.data.msg
+            this.$message.success("保存成功!")
+          }
+      })
     }
 
   },

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -183,8 +183,8 @@ export default {
       item_type: '0',
       items: [
         { id: 1, name: '药品' },
+        { id: 2, name: '项目' },
         { id: 3, name: '耗材' },
-        { id: 2, name: '项目' }
 
       ],
       list:[],
@@ -267,14 +267,16 @@ export default {
        this.tableList = new_arr
       }
       if(id == 3){
+       console.log("tabl4233223232323323223",this.tableList)
        var new_arr = []
        for(let i=0;i<this.tableList.length;i++){
         if(this.tableList[i].is_total != 1){
-          if(this.tableList[i].type == 3){
+          if(this.tableList[i].project_type == 3){
             new_arr.push(this.tableList[i])
           }  
         }
        }
+       console.log("new_ar3232332323232233223",new_arr)
        this.tableList = []
        this.tableList = new_arr
       }
@@ -939,7 +941,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -955,7 +957,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -971,7 +973,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -987,7 +989,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1003,7 +1005,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1019,7 +1021,7 @@ export default {
        var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1036,7 +1038,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1052,7 +1054,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1068,7 +1070,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1085,7 +1087,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1101,7 +1103,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1117,7 +1119,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1133,7 +1135,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1149,7 +1151,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -10,7 +10,7 @@
         </div>
         <div class="listInfo">
             <div>科别：{{getDepartment(his_patient.departments)}}</div>
-            <div>床号：</div>
+            <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：{{his_patient.number}}</div>
             <div>姓名：{{patient.name}}</div>
         </div>
@@ -46,6 +46,7 @@
         </div>
         <table class="listTable" border="1">
             <tr>
+                <td style="text-align:center" >序号</td>
                 <td style="text-align:center" >费用分类</td>
                 <td style="text-align:center">项目名称</td>
                 <td style="text-align:center">规格</td>
@@ -55,6 +56,10 @@
                 <td style="text-align:center" >医保类型</td>
             </tr>
             <tr v-for="(item, index) in tableList" :key="index">
+                <td style="text-align:center" >
+                  <span v-if="item.is_total == 2">{{index+1}}</span>
+                  <span v-if="item.is_total == 1">合计</span>
+                </td>
                 <td style="text-align:center" >
                   <span v-if="item.type == 1">
                     {{getAdviceMedChrgintmType(item.name)}}
@@ -127,6 +132,8 @@
           order_info_list:[],
           balanceAccountsType:0,
           medicalInsuranceLevelList:[],
+          schedule:[],
+          bedNumber:[],
         }
     },
     methods:{
@@ -187,11 +194,15 @@
            
             this.order_info_list = order_info
             var prescription = response.data.data.prescription
-            console.log("prescription23323232323233232323232233233223",prescription)
+           
             this.setMonthPrescription(prescription)
             this.balanceAccountsType = response.data.data.balanceAccountsType
 
             this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
+
+            this.schedule = response.data.data.schedule
+
+            this.bedNumber = response.data.data.bedNumber
             if(order_info!=undefined&&order_info ==null){
                this.list = []
                return
@@ -866,7 +877,6 @@
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
          }
-         console.log("化验23233223322323",this.tableList[i].drug_type)
          if(this.tableList[i].drug_type == "化验费"){
             total_price += this.tableList[i].count * this.tableList[i].price
          }
@@ -1002,6 +1012,17 @@
       }
       
       return total_price.toFixed(2)  
+    },
+    getBedName(id){
+      console.log("2332233223232323",id)
+      console.log("bed_number23223232232323232",this.bedNumber)
+      var bed_number = ""
+      for(let i=0;i<this.bedNumber.length;i++){
+        if(id == this.bedNumber[i].id){
+           bed_number = this.bedNumber[i].number
+        }
+      }
+      return bed_number
     }
     },
     created(){

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -8,7 +8,9 @@
         <div class="listTitle_1">{{$store.getters.xt_user.org.org_name}}发票联<span>收</span></div>
          <div class="listInfo">
             <div>收费日期：{{this.$route.query.end_time}}</div>
-            <div style="width:400px">发票代码：</div>
+            <div style="width:400px">发票代码：
+             <span v-if="order!=undefined && order.length > 0">{{order[0].fa_piao_code}}</span> 
+            </div>
         </div>
         <table class="listTable" table border rules=none cellspacing=0 align=center>
             <tr>
@@ -17,7 +19,10 @@
                 <td></td>
             </tr>
             <tr>
-                <td>费用类别：</td>
+                <td>费用类别：
+                  <span v-if="balanceAccountsType == 2">自费</span>
+                  <span v-if="balanceAccountsType != 2">医保</span>
+                </td>
                 <td>金额（元）：{{getAllPice()}}</td>
                 <td></td>
             </tr>
@@ -47,8 +52,10 @@
                 <td>其他：{{getOtherCostTotal()}}</td>
             </tr>
            <tr style="border: 1px solid;">
-               <td>合计金额（大写）：{{smalltoBIG((getAllPiceOne() + getWesternMedicineCostTotalOne() + getChineseTraditionalMedicineCostTotalOne()+getChineseTotalOne() +getCheckCostTotalOne()+getOxygenOne() + getOperationOne()+getLaboratoryCostTotalOne()+getBloodOne()+getZhenChaCostTotalOne()+getTreatementOne()+getNursingOne()+getBedCostTotalOne()+getAnesthesiaOne()+getMaterialCostTotalOne()+getOtherCostTotalOne()).toFixed(2))}}</td>
-               <td>人民币￥：{{(getAllPiceOne() + getWesternMedicineCostTotalOne() + getChineseTraditionalMedicineCostTotalOne()+getChineseTotalOne() +getCheckCostTotalOne()+getOxygenOne() + getOperationOne()+getLaboratoryCostTotalOne()+getBloodOne()+getZhenChaCostTotalOne()+getTreatementOne()+getNursingOne()+getBedCostTotalOne()+getAnesthesiaOne()+getMaterialCostTotalOne()+getOtherCostTotalOne())}}</td>
+                <td>合计金额（大写）：{{smalltoBIG(getAllPice())}}</td>
+               <td>人民币￥：{{getAllPice()}}</td>
+               <!-- <td>合计金额（大写）：{{smalltoBIG((getAllPiceOne() + getWesternMedicineCostTotalOne() + getChineseTraditionalMedicineCostTotalOne()+getChineseTotalOne() +getCheckCostTotalOne()+getOxygenOne() + getOperationOne()+getLaboratoryCostTotalOne()+getBloodOne()+getZhenChaCostTotalOne()+getTreatementOne()+getNursingOne()+getBedCostTotalOne()+getAnesthesiaOne()+getMaterialCostTotalOne()+getOtherCostTotalOne()).toFixed(2))}}</td>
+               <td>人民币￥：{{(getAllPiceOne() + getWesternMedicineCostTotalOne() + getChineseTraditionalMedicineCostTotalOne()+getChineseTotalOne() +getCheckCostTotalOne()+getOxygenOne() + getOperationOne()+getLaboratoryCostTotalOne()+getBloodOne()+getZhenChaCostTotalOne()+getTreatementOne()+getNursingOne()+getBedCostTotalOne()+getAnesthesiaOne()+getMaterialCostTotalOne()+getOtherCostTotalOne())}}</td> -->
                <td></td>
             </tr>
             <tr style="height: 65px;">
@@ -62,7 +69,7 @@
                 收款单位（章）：
             </div>
             <div style="width:300px">
-                收费员：
+                收费员：{{getAdminRole(admin_user_id)}}
             </div>
             <div style="width:300px">
                {{printDate}}
@@ -98,6 +105,7 @@
           order_info_list:[],
           balanceAccountsType:0,
           medicalInsuranceLevelList:[],
+          balanceAccountsType:0,
         }
     },
     methods:{
@@ -743,10 +751,10 @@
       }
       return total_price.toFixed(2)
     },
-    getAdviceMedChrgintmType(advice_id){
+    getAdviceMedChrgintmType(name){
       var med_chrgitm_type = ""
       for(let i=0;i<this.order_info_list.length;i++){
-        if(advice_id == this.order_info_list[i].advice_id){
+        if(name == this.order_info_list[i].advice.advice_name){
           med_chrgitm_type = this.order_info_list[i].med_chrgitm_type
         }
       }
@@ -792,7 +800,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
          if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -808,7 +816,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -824,7 +832,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -840,7 +848,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -856,7 +864,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -872,7 +880,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -888,7 +896,7 @@
        var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -905,7 +913,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -921,7 +929,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -937,7 +945,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -954,7 +962,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -970,7 +978,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -986,7 +994,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1002,7 +1010,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1018,7 +1026,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1040,7 +1048,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
          if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1056,7 +1064,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1072,7 +1080,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1088,7 +1096,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1104,7 +1112,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1120,7 +1128,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList.project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1136,7 +1144,7 @@
        var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1153,7 +1161,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1169,7 +1177,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1185,7 +1193,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1202,7 +1210,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1218,7 +1226,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1234,7 +1242,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1250,7 +1258,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1266,7 +1274,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
@@ -1277,14 +1285,25 @@
       }
       
       return total_price 
+    },
+    getAdminRole(admin_user_id){
+      var user_name = ""
+      for(let i=0;i<this.admin.length;i++){
+        if(admin_user_id == this.admin[i].admin_user_id){
+            user_name = this.admin[i].user_name
+        }
+      }
+      return user_name
     }
     },
     created(){
+      this.admin_user_id = this.$store.getters.xt_user.user.id
+      console.log("admin_user_id23323232323",this.admin_user_id)
       this.getGatherDetailList()   
       var data = new Date();
       var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
       var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-      this.printDate = data.getFullYear() + "-" + month + "-" + date;
+      this.printDate = data.getFullYear() + "年" + month + "月" + date+"日";
     }
 
   }