518合并代码

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1372,7 +1372,6 @@
       }
       ,
       submitAdvice() {
-        console.log("保存111111111111111111111")
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
@@ -1387,9 +1386,6 @@
         }
         let mode = '1'
 
-        console.log("==this.form==",this.form)
-        console.log("==this.src_type==",this.src_type)
-
        if(this.src_type == ""){
           this.form.way = 1
        }
@@ -1398,9 +1394,8 @@
           var arr = this.form.advice_name.split("(自备药)")
           this.form.advice_name = arr[0]
        }
-
+        console.log("保存重要23233232322332",this.form.parent_id)
         CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
-          console("保存!!!!!!!!!!!!!!!this.form")
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1417,11 +1412,12 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-              console.log("保存",this.form.parent_id)
+              console.log("parnet_i233232233223",this.form.parent_id)
               if (this.form.parent_id > 0) {
+                
                 var spliceIndex = -1
+                console.log("splicinde2332323232323223",spliceIndex)
                 for (let index = this.doctor_advices.length - 1; ; index--) {
-                  console.log("====this.doctor_advices[index].origin====",this.doctor_advices[index].origin)
                   if (this.doctor_advices[index].parent_id === this.form.parent_id) {
                     spliceIndex = index
                     break
@@ -1430,6 +1426,7 @@
                     break
                   }
                 }
+               console.log("splicinde2332323232323223",spliceIndex)
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1442,6 +1439,7 @@
                     }
                   }
                 }
+               
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
               }

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -297,7 +297,7 @@ export default {
                 }
               } 
             }
-            console.log("项目new_arr",new_arr)
+            // console.log("项目new_arr",new_arr)
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
             // console.log("ar3233223232",new_arr)
@@ -322,7 +322,7 @@ export default {
             this.tableData = new_arr
           }      
           
-          console.log("hh233223233232323232322332",this.tableData)
+          // console.log("hh233223233232323232322332",this.tableData)
        }
      })
     },

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -9,9 +9,13 @@
             <div>医疗机构名称：{{$store.getters.xt_user.org.org_name}}</div>
         </div>
         <div class="listInfo">
-            <div>科别：{{getDepartment(his_patient.departments)}}</div>
+            <div>科别：{{getDepartment(his_patient.departments)}}
+              {{getDepartment(his_record_patient.departments)}}
+            </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
-            <div>门诊号：{{his_patient.number}}</div>
+            <div>门诊号：{{his_patient.number}}
+               {{his_record_patient.ipt_otp_no}}
+            </div>
             <div>姓名：{{patient.name}}</div>
         </div>
          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 20px;">
@@ -53,7 +57,7 @@
                 <td style="text-align:center">单价</td>
                 <td style="text-align:center" >数量</td>
                 <td style="text-align:center">金额</td>
-                <td style="text-align:center" >医保类型</td>
+                <td style="text-align:center" >医保类别</td>
             </tr>
             <tr v-for="(item, index) in tableList" :key="index">
                 <td style="text-align:center" >
@@ -62,14 +66,14 @@
                 </td>
                 <td style="text-align:center" >
                   <span v-if="item.type == 1">
-                    {{getAdviceMedChrgintmType(item.name)}}
+                   {{item.cost_type}}
+                 </span>
+                  <span v-if="item.type == 2">
+                    {{item.cost_type}} 
                   </span>
-                   <span v-if="item.type == 2">
-                    {{getProjectMedChrgintmType(item.project_id)}}
-                   </span>
-                    <span v-if="item.type == 3">
-                        {{getProjectMedChrgintmType(item.project_id)}}
-                    </span>
+                  <span v-if="item.type == 3">
+                    材料费
+                  </span> 
                 </td>
                 <td style="text-align:center" >
                   <span>{{item.name}}</span>  
@@ -78,28 +82,17 @@
                   {{ item.spec }}
                 </td>
                 <td style="text-align:center" >
-                  {{item.price}}  
+                  {{item.pric}}  
                 </td>
                 <td style="text-align:center" >
-                   {{item.count }}{{item.unit }}
+                   {{item.count_number }}{{item.unit }}
                 </td>
                 <td style="text-align:center" >
                    <span v-if="item.is_total == 1">{{ item.total }}</span>  
-                   <span v-if="item.is_total == 2">{{ (item.price * item.count).toFixed(2) }}</span> 
+                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span> 
                 </td>
                 <td style="text-align:center" >
-                     <span v-if="balanceAccountsType == 2">{{getChrgitmLv(item.chrgitm_lv)}}</span>
-                      <span v-if="balanceAccountsType != 2">
-                        <span v-if="item.type == 1">
-                            {{getAdviceMedChrgintmLv(item.advice_id)}}
-                        </span>
-                        <span v-if="item.type == 2">
-                          {{getProjectMedChrgintmLv(item.project_id)}}
-                        </span>
-                        <span v-if="item.type == 3">
-                            {{getProjectMedChrgintmLv(item.project_id)}}
-                        </span>
-                      </span>
+                  {{getChrgitmLv(item.medical_insurance_level)}}
                 </td>
             </tr>
         </table>
@@ -134,6 +127,16 @@
           medicalInsuranceLevelList:[],
           schedule:[],
           bedNumber:[],
+          tableList:[],
+          order_info_list:[],
+          balanceAccountsType:0,
+          medicalInsuranceLevelList:[],
+          drugTypeList:[],
+          costClassifyList:[],
+          id:0,
+          start_time:"",
+          end_time:"",
+          his_record_patient:{},
         }
     },
     methods:{
@@ -166,13 +169,14 @@
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d}')
       },
-     getGatherDetailList() {
-      
+    getGatherDetailList() {
+      let start_time = this.$route.query.start_time
+      let end_time =  this.$route.query.end_time
       let params = {
         patient_id:this.$route.query.patient_id,
-        start_time: this.$route.query.start_time,
-        end_time: this.$route.query.end_time,
-        type:this.$route.query.type,
+        start_time: start_time,
+        end_time: end_time,
+        type: this.$route.query.type,
         keyword: this.$route.query.keyword
       }
      getGatherDetailList(params).then(response=>{
@@ -180,219 +184,187 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.order = response.data.data.order
-            this.patient = response.data.data.patient
-            this.admin = response.data.data.admin_info
-            this.his_hospital = response.data.data.his_hospital
+          this.drugTypeList =response.data.data.drugTypeList
+          this.costClassifyList = response.data.data.costClassifyList 
+          var list = response.data.data.list
+          console.log("listw3232323223",list)
 
-            var order_info = response.data.data.order_info
-           
-            for(let i=0;i<order_info.length;i++){
-              order_info[i].med_chrgitm_type = this.getType(order_info[i].med_chrgitm_type)
-              order_info[i].chrgitm_lv  = this.getMedicineInsuranceType(order_info[i].chrgitm_lv)
-            }
-           
-            this.order_info_list = order_info
-            var prescription = response.data.data.prescription
-           
-            this.setMonthPrescription(prescription)
-            this.balanceAccountsType = response.data.data.balanceAccountsType
+          var new_arr = []
 
-            this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].orders.length;j++){
+               new_arr.push(list[i].orders[j])
+            }
+          }
+          console.log("new_arr2332323232",new_arr)
 
-            this.schedule = response.data.data.schedule
+          var order_info = []
+          for(let i=0;i<new_arr.length;i++){
+            for(let j=0;j<new_arr[i].order_info.length;j++){
+                order_info.push(new_arr[i].order_info[j])
+            }
+          }
 
-            this.bedNumber = response.data.data.bedNumber
-            if(order_info!=undefined&&order_info ==null){
-               this.list = []
-               return
+           for(let i=0;i<order_info.length;i++){
+            if(order_info[i].advice_id > 0){
+              order_info[i].item_id = order_info[i].advice.drug.id +"_" + order_info[i].pric
             }
-            this.his_patient = response.data.data.his_patient
-            this.hisDepatment = response.data.data.hisDepatment
-            this.list = []
-            this.westernMedicineCostTotal = response.data.data.westernMedicineCostTotal
-            this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
-            this.checkCostTotal = response.data.data.checkCostTotal
-            this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
-            this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
-            this.bedCostTotal = response.data.data.bedCostTotal
-            this.otherCostTotal = response.data.data.otherCostTotal
-            this.materialCostTotal = response.data.data.materialCostTotal
-            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
-              //获取所有项目类型进行去重
-              let med_chrgitm_types = []
-              for (let i = 0; i < order_info.length; i++) {
-                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+            if(order_info[i].project_id > 0){
+              if(order_info[i].project.type == 2){
+                order_info[i].item_id = order_info[i].project.project.id + "_"+order_info[i].pric
+              }
+              if(order_info[i].project.type == 3){
+                order_info[i].item_id = order_info[i].project.good_info.id + "_"+order_info[i].pric
               }
-              const obj = {}
-              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
-                obj[next] ? '' : obj[next] = true && cur.push(next)
-                return cur
-              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+          }
+          console.log("order_info222222222222",order_info)
+          
+          //合并，相同的合并在一起
 
-              let tempOrderInfo = []
-            
-              for (let i = 0; i < med_chrgitm_types.length; i++) {
-                let obj = {
-                  total: 0,
-                  details: [],
-                  is_total:0,
-                }
-                let tempDetails = []
-                for (let b = 0; b < order_info.length; b++) {
-                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
-                    tempDetails.push(order_info[b])
-                  }
-                }
-                obj.details = this.setNewData(tempDetails)
-                this.list = []
-                this.list =  this.list.concat(obj.details)
-                for(let i=0;i<this.list.length;i++){
-                  if(this.list[i].is_total == 1){
-                     this.list[i].index = "合计"
-                  }else{
-                    this.list[i].index = i+1
-                  }
-                 
-                }
+          let dataInfo = {}
+          order_info.forEach((item, index) => {
+            let { item_id } = item
+            if (!dataInfo[item_id]) {
+              dataInfo[item_id] = {
+                item_id,
+                child: [],
+                count_number:0,
+                record_date:"",
+                cost_type:"",
+                name:"",
+                pric:item.pric,
+                chrgitm_lv:"",
+                advice_id:item.advice_id,
+                project_id:item.project_id,
+                type:0,
+                spec:"",
+                unit:"",
+                medical_insurance_level:"",
+                cost_type:"",
+                is_total:2,
               }
-              let newobj = {}
-              newobj['total'] = this.order.medfee_sumamt
-              newobj['is_total'] = 1
-              this.list = []
-              this.list.push(newobj)
-            }else{
-              //获取所有项目类型进行去重
-              let med_chrgitm_types = []
-              if(order_info!=undefined && order_info.length > 0){
-                for (let i = 0; i < order_info.length; i++) {
-                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+            }
+            dataInfo[item_id].child.push(item)
+          })
+          let arr = Object.values(dataInfo) 
+          
+          for(let i=0;i<arr.length;i++){
+            for(let j=0;j<arr[i].child.length;j++){
+               if(arr[i].advice_id >0){
+                  arr[i].record_date = arr[i].child[0].advice.advice_date
+                  arr[i].type = 1
+                  arr[i].name = arr[i].child[0].advice.advice_name
+                  arr[i].spec = arr[i].child[0].advice.drug.dose + arr[i].child[0].advice.drug.dose_unit + "*"+arr[i].child[0].advice.drug.min_number + arr[i].child[0].advice.drug.min_unit+"/"+arr[i].child[0].advice.drug.max_unit
+                  arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
+                  arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
+                  arr[i].medical_insurance_level = arr[i].child[0].advice.drug.medical_insurance_level
+                 
+                 
                }
-              }
-             
-              const obj = {}
-              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
-                obj[next] ? '' : obj[next] = true && cur.push(next)
-                return cur
-              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-              let tempOrderInfo = []
-             
-              for (let i = 0; i < med_chrgitm_types.length; i++) {
-                let obj = {
-                  total: 0,
-                  details: []
-                }
-                let tempDetails = []
-                for (let b = 0; b < order_info.length; b++) {
-                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
-                    tempDetails.push(order_info[b])
+               if(arr[i].project_id > 0){
+                  arr[i].record_date = arr[i].child[0].project.record_date
+                  arr[i].type = arr[i].child[0].project.type
+                  if(arr[i].child[0].project.type == 2){
+                    arr[i].name = arr[i].child[0].project.project.project_name
+                    arr[i].spec = arr[i].child[0].project.project.project_name
+                    arr[i].unit = arr[i].child[0].project.project.unit
+                    arr[i].medical_insurance_level = arr[i].child[0].project.project.medical_coverage
+                    arr[i].cost_type = arr[i].child[0].project.project.cost_classify
                   }
-                }
-                
-                obj.details = this.setNewData(tempDetails)
-               
-                obj.total = this.getTotal(obj.details)
-
-                obj.details.push({
-                  total: obj.total,
-                  is_total: 1,
-                })
-                this.list = []
-                this.list =  this.list.concat(obj.details)
-                for(let i=0;i<this.list.length;i++){
-                  if(this.list[i].is_total == 1){
-                     this.list[i].index = "合计"
-                  }else{
-                    this.list[i].index = i+1
+                  if(arr[i].child[0].project.type == 3){
+                    arr[i].name = arr[i].child[0].project.good_info.good_name
+                    arr[i].spec = arr[i].child[0].project.good_info.specification_name
+                    arr[i].unit = arr[i].child[0].project.good_info.packing_unit
+                    arr[i].medical_insurance_level = arr[i].child[0].project.good_info.medical_insurance_level
+                    arr[i].cost_type = "材料费"
                   }
-                 
-                }
-               
-             }
-          }
-        }
-
-        if(this.$route.query.id == 1){
-          var new_arr = []
-          var objOne = {index:"合计",is_total:1,total:0}
-          objOne.total = this.getTotalPriceTwo(this.tableList)
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].is_total != 1){
-            if(this.tableList[i].type == 1){
-              new_arr.push(this.tableList[i])
-            }  
-           }
-          }
-          new_arr.push(objOne)
-          this.tableList = []
-          this.tableList = new_arr
-        }
-        if(this.$route.query.id == 2){
-          var new_arr = []
-          var objOne = {index:"合计",is_total:1,total:0}
-          objOne.total = this.getTotalPriceTwo(this.tableList)
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].is_total != 1){
-            if(this.tableList[i].project_type == 2){
-              new_arr.push(this.tableList[i])
-            }  
-          }
+               }
+               arr[i].count_number +=arr[i].child[j].cnt
+            }
           }
-          this.tableList = []
-          new_arr.push(objOne)
-          this.tableList = new_arr
-        }
-        if(this.$route.query.id == 3){
-          console.log("2323232332233232322332",this.tableList)
-          var new_arr = []
-          var objOne = {index:"合计",is_total:1,total:0}
-          objOne.total = this.getTotalPriceTwo(this.tableList)
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].is_total != 1){
-            if(this.tableList[i].project_type == 3){
-              new_arr.push(this.tableList[i])
-            }  
-           }
+          console.log("arr2323233232322332",arr)
+          var obj = {is_total:1,total:0}
+          obj.total = this.getAllPiceTwo(arr)
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].advice_id >0){
+               arr[i].cost_type = this.getDrugType(arr[i].cost_type)
+            }
+            if(arr[i].type ==2){
+              arr[i].cost_type = this.getCostType(arr[i].cost_type)
+            }
           }
-          new_arr.push(objOne)
-          this.tableList = []
-          this.tableList = new_arr
-        }
-        console.log("keyworde23232322332323232233232",this.$route.query.keyword)
-        
-        if(this.$route.query.keyword!=""){
-          var new_arr = []
-          for(let i=0;i<this.tableList.length;i++){
-            if(this.tableList[i].is_total!=1){
-              if(this.tableList[i].name.indexOf(this.$route.query.keyword) >-1){
+          arr.push(obj)
+
+          this.tableList = arr
+          console.log("打印",this.tableList)
+          this.patient = response.data.data.patient
+          console.log("patinet",this.patient)
+          this.his_patient = response.data.data.his_patient
+          this.hisDepatment =  response.data.data.hisDepatment
+          this.order =  response.data.data.order
+          this.his_record_patient = response.data.data.his_record_patient
+          this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
+          this.schedule = response.data.data.schedule
+          this.bedNumber = response.data.data.bedNumber
+          if(this.$route.query.keyword !=""){
+            console.log("金拉风3322323232323",this.$route.query.keyword)
+            console.log("Ar23233232323223",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].name.indexOf(this.$route.query.keyword) >-1){
                   new_arr.push(this.tableList[i])
                 }
               }
+             
+             }
+              var obj ={index:"合计",is_total:1,total:0}
+              obj.total = this.getAllPiceTwo(new_arr)
+              new_arr.push(obj)
+              this.tableList = []
+              this.tableList = new_arr
           }
-          var obj ={index:"合计",is_total:1,total:0}
-          obj.total = this.getTotalPriceTwo(new_arr)
-          new_arr.push(obj)
-          this.tableList = []
-          this.tableList = new_arr
-        }
 
-      
-        var new_arr_two = []
-        for(let i=0;i<this.tableList.length;i++){
-            if(this.tableList[i].advice_id > 0){
-              this.tableList[i].const_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
+          if(this.$route.query.id == 1){
+             var new_arr = []
+             for(let i=0;i<this.tableList.length;i++){
+                if(this.tableList[i].is_total!=1){
+                  if(this.tableList[i].type == 1){
+                   new_arr.push(this.tableList[i])
+                }  
+              }
+                
+             }
+             this.tableList = []
+             this.tableList = new_arr
             }
-            if(this.tableList[i].project_id > 0){
-              this.tableList[i].const_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
+            if(this.$route.query.id  == 2){
+             var new_arr = []
+             for(let i=0;i<this.tableList.length;i++){
+               if(this.tableList[i].is_total!=1){
+                  if(this.tableList[i].type == 2){
+                
+                  new_arr.push(this.tableList[i])
+                }  
+              }
+             }
+             this.tableList = []
+             this.tableList = new_arr
             }
-            
-            if(this.tableList[i].const_type!=''){
-              new_arr_two.push(this.tableList[i])
+            if(this.$route.query.id  == 3){
+             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){
+                    new_arr.push(this.tableList[i])
+                }  
+              }
+             }
+             this.tableList = []
+             this.tableList = new_arr
             }
-
-          }
-          this.tableList = []
-          this.tableList = new_arr_two
+        }
      })
     },
      getAdviceName(id){
@@ -672,9 +644,24 @@
     getAllPice(){
 
       var total_price = 0
-      for(let i=0;i<this.list.length;i++){
-        if(this.list[i].is_total ==2){
-          total_price += (this.list[i].price * parseInt(this.list[i].count))
+      for(let i=0;i<this.tableList.length;i++){
+        if(this.tableList[i].is_total ==2){
+          total_price += (this.tableList[i].pric * parseInt(this.tableList[i].count_number))
+        }
+      }
+      if(total_price > 0){
+        return total_price.toFixed(2)
+      }else{
+        return total_price
+      }
+     
+    },
+    getAllPiceTwo(arr){
+
+      var total_price = 0
+      for(let i=0;i<arr.length;i++){
+        if(arr[i].is_total ==2){
+          total_price += (arr[i].pric * parseInt(arr[i].count_number))
         }
       }
       if(total_price > 0){
@@ -863,17 +850,56 @@
       }
       return chrgitm_lv
     },
+    getAdviceMedChrgintmType(name){
+      var med_chrgitm_type = ""
+      for(let i=0;i<this.order_info_list.length;i++){
+        if(name == this.order_info_list[i].advice.advice_name){
+          med_chrgitm_type = this.order_info_list[i].med_chrgitm_type
+        }
+      }
+      return med_chrgitm_type
+    },
+    getProjectMedChrgintmType(project_id){
+      var med_chrgitm_type = ""
+      for(let i=0;i<this.order_info_list.length;i++){
+        if(project_id == this.order_info_list[i].project_id){
+          med_chrgitm_type = this.order_info_list[i].med_chrgitm_type
+        }
+      }
+      return med_chrgitm_type
+    },
+    getChrgitmLv(value){
+      var name = ""
+      for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
+        if(value == this.medicalInsuranceLevelList[i].value){
+           name = this.medicalInsuranceLevelList[i].name
+        }
+      }
+      return name
+    },
+    getAdviceMedChrgintmLv(advice_id){
+     var chrgitm_lv = ""
+      for(let i=0;i<this.order_info_list.length;i++){
+        if(advice_id == this.order_info_list[i].advice_id){
+          chrgitm_lv = this.order_info_list[i].chrgitm_lv
+        }
+      }
+      return chrgitm_lv
+    },
+    getProjectMedChrgintmLv(advice_id){
+     var chrgitm_lv = ""
+      for(let i=0;i<this.order_info_list.length;i++){
+        if(advice_id == this.order_info_list[i].advice_id){
+          chrgitm_lv = this.order_info_list[i].chrgitm_lv
+        }
+      }
+      return chrgitm_lv
+    },
     getWesternMedicineCostTotal(){
       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].name)
-         }
-         if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "西药费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "西药"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
       
@@ -882,237 +908,158 @@
     getChineseTraditionalMedicineCostTotal(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "中成药费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "中成药"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getChineseTotal(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "中草药"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "中草药"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getCheckCostTotal(){
       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)
-         }
-        if(this.tableList.project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "检查费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "检验费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getOxygen(){
-      var total_price = 0
+     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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "输氧费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "输氧费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getOperation(){
       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)
-         }
-        if(this.tableList.project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "手术费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "手术费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getLaboratoryCostTotal(){
-       var total_price = 0
+      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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "化验费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "化验费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getBlood(){
-      var total_price = 0
+     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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "输血费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "输血费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
       return total_price.toFixed(2)
     },
     getZhenChaCostTotal(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "诊察费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "诊断费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2) 
+      return total_price.toFixed(2)
     },
     getTreatement(){
-      var total_price = 0
+     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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         
-         if(this.tableList[i].drug_type == "治疗费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "治疗费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2) 
+      return total_price.toFixed(2)
     },
     getNursing(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "护理费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "护理费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2) 
+      return total_price.toFixed(2)
     },
     getBedCostTotal(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "床位费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "床位费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2)  
+      return total_price.toFixed(2)
     },
     getAnesthesia(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "麻醉费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "麻醉费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2)  
+      return total_price.toFixed(2)
     },
     getMaterialCostTotal(){
       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)
-         }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "材料费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+         if(this.tableList[i].cost_type == "材料费"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
-      return total_price.toFixed(2)  
+      return total_price.toFixed(2)
     },
     getOtherCostTotal(){
       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)
+         if(this.tableList[i].cost_type == "其他"){
+            total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
-        if(this.tableList[i].project_id > 0){
-           this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
-         }
-         if(this.tableList[i].drug_type == "其他费"){
-            total_price += this.tableList[i].count * this.tableList[i].price
+      }
+      return total_price.toFixed(2)
+    },
+    getDrugType(id){
+      console.log("id2332323232233232232323",id)
+      var name = ""
+      for(let i=0;i<this.drugTypeList.length;i++){
+         if(id == this.drugTypeList[i].value){
+          name = this.drugTypeList[i].name
          }
       }
-      
-      return total_price.toFixed(2)  
+      return name
+    },
+    getCostType(id){
+     var name = ""
+     for(let i=0;i<this.costClassifyList.length;i++){
+       if(id == this.costClassifyList[i].value){
+         name = this.costClassifyList[i].name
+       }
+     }
+     return name
     },
     getBedName(id){
-      var bed_number = ""
+      var number = ""
       for(let i=0;i<this.bedNumber.length;i++){
         if(id == this.bedNumber[i].id){
-           bed_number = this.bedNumber[i].number
+          number = this.bedNumber[i].number
         }
       }
-      return bed_number
+      return number
     }
+
     },
     created(){
       this.getGatherDetailList()