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/components/allgather.vue

@@ -473,19 +473,19 @@ export default {
         let name = order.name
         let item_name = order.item_name
         let pay_sumamt = order.price.toFixed(2)
-        let total = order.sum.toFixed(2)
+        // let total = order.sum.toFixed(2)
 
         let obj = {
           '患者姓名': name,
           '项目类别': item_name,
           '费用': pay_sumamt,
-          '费用总额': total
+          // '费用总额': total
         }
         list.push(obj)
       }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['患者姓名', '项目名称', '费用', '费用总额']
-        const filterVal = ['患者姓名', '项目名称', '费用', '费用总额']
+        const tHeader = ['患者姓名', '项目名称', '费用']
+        const filterVal = ['患者姓名', '项目名称', '费用']
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel1({
           header: tHeader,

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -270,7 +270,7 @@
                   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
+                  arr[i].medical_insurance_level = arr[i].child[0].chrgitm_lv
 
 
                }
@@ -281,14 +281,14 @@
                     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].medical_insurance_level = arr[i].child[0].chrgitm_lv
                     arr[i].cost_type = arr[i].child[0].project.project.cost_classify
                   }
                   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].medical_insurance_level = arr[i].child[0].chrgitm_lv
                     arr[i].cost_type = "材料费"
                   }
                }
@@ -337,6 +337,8 @@
               this.tableList = new_arr
           }
 
+
+
           if(this.$route.query.id == 1){
              var new_arr = []
              for(let i=0;i<this.tableList.length;i++){
@@ -374,7 +376,53 @@
              }
              this.tableList = []
              this.tableList = new_arr
+
+            }
+
+            let tempList = []
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "西药"){
+                tempList.push(this.tableList[i])
+              }
+            }
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "治疗费"){
+                tempList.push(this.tableList[i])
+              }
+            }
+
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "材料费"){
+                tempList.push(this.tableList[i])
+              }
+            }
+
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "化验费"){
+                tempList.push(this.tableList[i])
+              }
+            }
+
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "检查费"){
+                tempList.push(this.tableList[i])
+              }
+            }
+
+            for(let i = 0; i < this.tableList.length;i++){
+              if(this.tableList[i].cost_type == "护理费"){
+                tempList.push(this.tableList[i])
+              }
+            }
+
+            for(let i = 0; i < this.tableList.length;i++){
+            if(this.tableList[i].cost_type != "材料费"  && this.tableList[i].cost_type != "西药" && this.tableList[i].cost_type != "护理费" && this.tableList[i].cost_type != "治疗费" && this.tableList[i].cost_type != "化验费"  && this.tableList[i].cost_type != "检查费" ){
+                tempList.push(this.tableList[i])
+              }
             }
+            this.tableList = []
+            this.tableList = tempList
+
         }
      })
     },