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

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

               <tr>
                 <td>床位费</td>
                 <td>&nbsp;{{info.bed_cost_total?info.bed_cost_total:''}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('床位费')</td>
+                <td>&nbsp;getYiTotal('床位费')</td>
                 <td>&nbsp;{{info.bed_cost_self_total?info.bed_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>检查费</td>
                 <td>&nbsp;{{info.check_cost_total?info.check_cost_total:''}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('检查费')</td>
+                <td>&nbsp;getYiTotal('检查费')</td>
                 <td>&nbsp;{{info.check_cost_self_total?info.check_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>化验费</td>
                 <td>&nbsp;{{info.laboratory_cost_total?info.laboratory_cost_total:''}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('化验费')</td>
+                <td>&nbsp;getYiTotal('化验费')</td>
                 <td>&nbsp;{{info.laboratory_cost_self_total?info.laboratory_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>治疗费</td>
                 <td>&nbsp;{{info.treat_cost_total?info.treat_cost_total:''}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('治疗费')</td>
+                <td>&nbsp;getYiTotal('治疗费')</td>
                 <td>&nbsp;{{info.treat_cost_self_total?info.treat_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>手术费</td>
                 <td>&nbsp;{{info.operation_cost_total?info.operation_cost_total:''}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('手术费')</td>
+                <td>&nbsp;getYiTotal('手术费')</td>
                 <td>&nbsp;{{info.operation_cost_self_total?info.operation_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>卫生材料费</td>
                 <td>&nbsp;{{info.material_cost_total?info.material_cost_total:""}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('卫生材料费')</td>
+                <td>&nbsp;getYiTotal('卫生材料费')</td>
                 <td>&nbsp;{{info.material_cost_self_total?info.material_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>西药费</td>
                 <td>&nbsp;{{info.western_medicine_cost_total?info.western_medicine_cost_total:""}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('西药费')</td>
+                <td>&nbsp;getYiTotal('西药费')</td>
                 <td>&nbsp;{{info.western_medicine_cost_self_total?info.western_medicine_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>中成药费</td>
                 <td>&nbsp;{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:""}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('中成药费')</td>
+                <td>&nbsp;getYiTotal('中成药费')</td>
                 <td>&nbsp;{{info.chinese_traditional_medicine_cost_self_total?info.chinese_traditional_medicine_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>其他费</td>
                 <td>&nbsp;{{info.other_cost_total?info.other_cost_total:""}}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;getJiaTotal('其他费')</td>
+                <td>&nbsp;getYiTotal('其他费')</td>
                 <td>&nbsp;{{info.other_cost_self_total?info.other_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
     }
   },
   methods:{
+    getJiaTotal(name){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+        if(name == this.list[i].med_chrgitm_name){
+          total = this.list[i].jiaTotal
+
+        }
+      }
+      return total
+    },
+    getYiTotal(name){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+        if(name == this.list[i].med_chrgitm_name){
+          total = this.list[i].yiTotal
+
+        }
+      }
+      return total
+
+    },
     getNaty(naty){
       switch (naty){
         case "1":

src/xt_pages/hospitalStation/statementPrint.vue

             that.info['order_infos'] = response.data.data.order_infos
             that.info['diagnosis'] = response.data.data.diagnosis
 
+            //获取所有项目类型进行去重
+            let med_chrgitm_types = []
+            for (let i = 0; i < response.data.data.order_infos.length; i++) {
+              med_chrgitm_types.push(response.data.data.order_infos[i].med_chrgitm_type)
+            }
+            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 = {
+                details: [],
+                med_chrgitm_name: this.getType(med_chrgitm_types[i]),
+                jiaTotal: 0,
+                total: 0,
+                yiTotal: 0,
+                noMedicineTotal: 0,
+                bingTotal: 0,
+                otherTotal: 0,
+              }
+
+              let tempDetails = []
+              for (let b = 0; b < response.data.data.order_infos.length; b++) {
+                if (med_chrgitm_types[i] == response.data.data.order_infos[b].med_chrgitm_type) {
+                  tempDetails.push(response.data.data.order_info[b])
+                }
+              }
+              obj.total = this.getTotal(tempDetails)
+              obj.jiaTotal = this.getJiaTotal(tempDetails)
+              obj.yiTotal = this.getYiTotal(tempDetails)
+              obj.noMedicineTotal = this.getNoMedicineTotal(tempDetails)
+              obj.bingTotal = this.getBingTotal(tempDetails)
+              obj.otherTotal = this.getOtherTotal(tempDetails)
+
+              obj.details = this.setNewData(tempDetails)
+              this.list.push(obj)
+
+            }
           }
         })
 

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

       >
         <tr style="border: 1px solid" >
           <td style="width: 19%">账单名称：{{item.med_chrgitm_name}}</td>
-          <td style="width: 25%">费用名称</td>
+          <td style="width: 21%">费用名称</td>
           <td style="width: 14%">规格</td>
           <td style="width: 10%">类别</td>
           <td style="width: 10%">单价(元)</td>
           <td style="width: 20%">金额(元)</td>
         </tr>
         <tr v-for="subItem in item.details">
-          <td style="width: 20%">{{subItem.name}}</td>
-          <td style="width: 25%"></td>
+          <td style="width: 19%">{{subItem.name}}</td>
+          <td style="width: 21%"></td>
           <td style="width: 14%">{{ subItem.spec }}</td>
           <td style="width: 10%">{{ subItem.medicine_insurance_kind }}</td>
           <td style="width: 10%">{{ subItem.price.toFixed(2) }}</td>
           <td style="width: 5%">非药品：{{0.00}}</td>
           <td style="width: 5%">丙类：{{item.bingTotal}}</td>
           <td style="width: 5%">其他：{{0.00}}</td>
-          <td style="width: 20%">小计：{{item.total}}</td>
           <td></td>
+          <td style="width: 20%">小计：{{item.total}}</td>
 
         </tr>
       </table>