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

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -300,13 +300,17 @@
           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)
+               arr[i].cost_type = this.getType(arr[i].child[0].med_chrgitm_type)
             }
             if(arr[i].type ==2){
-              arr[i].cost_type = this.getCostType(arr[i].cost_type)
+              arr[i].cost_type = this.getType(arr[i].child[0].med_chrgitm_type)
             }
           }
           arr.push(obj)
+            console.log("arr")
+            console.log(arr)
+            console.log("arr")
+
 
           this.tableList = arr
 
@@ -637,7 +641,7 @@
 
             break
           case '09':
-            return '西药费'
+            return '西药'
 
             break
           case '10':
@@ -645,7 +649,7 @@
 
             break
           case '11':
-            return '中成药费'
+            return '中成药'
 
             break
           case '12':
@@ -657,8 +661,7 @@
 
             break
           case '14':
-            return '其他费'
-
+            return '其他'
             break
 
         }