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

src/api/his/his.js

 }
 
 
+export function newsummary(params) {
+  return request({
+    url: '/api/export/summary',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
 
 
 

src/xt_pages/Pharmacy/print/patientPrint.vue

       this.visibility = true;
       console.log("val",val)
       this.tableData = val
-      this.name = data.Name
+      this.name = data.name
       if (state == 1){
         this.state = "待发药"
       }

src/xt_pages/Pharmacy/print/patientPrintTwo.vue

     show: function (val,data,state,times,base,patients,doctors,arr,diagnosis) {
       this.times = times
       this.visibility = true;
-      console.log("val",val)
+      console.log("val111",val)
+      console.log("val222",data)
+      console.log("val333",base)
+      console.log("val4444",patients)
+
       this.tableData = []
       for(let i =0; i < val.length;i++){
         if(val[i].Type == 1){
         }
       }
       this.Doctor = val[0].Doctor
-      this.name = data.Name
+      this.name = data.name
       this.DialysisNo = data.DialysisNo
       this.patients = patients
       this.doctors = doctors

src/xt_pages/outpatientTool/components/personSettle.vue

 
         </el-popover> -->
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+
+        <el-button size="small" type="primary" @click="export_detail_two" v-if="this.$store.getters.xt_user.org_id == 9478">收入统计</el-button>
+
       </div>
     </div>
     <el-table ref="tables" :data="tableData" border :row-style="{ color: '#303133' }"
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetSummarySettle,changeOrderDesc } from '@/api/his/his'
 import { uParseTime } from '@/utils/tools'
+import {newsummary} from "../../../api/his/his";
 // import NewStatementPrint from './newStatementPrint'
 const moment = require('moment')
 export default {
           colspan: _col
         }
       }
+    },export_detail_two(){
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+      }
+      // this.settle_loading = true
+      newsummary(params).then(response => {
+        if (response.data.state == 0) {
+          this.settle_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+
+          let org_info = response.data.data.org_info
+          let result = response.data.data.result
+
+
+          let list = []
+          for (let i = 0; i < result.length; i++) {
+            let order = result[i]
+            let name = order.PsnName
+
+
+            let type_name = ""
+            if(order.TypeName == '城乡'){
+              // let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+              let a =  org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+
+              let e =  org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+
+              let f=  order.CanBaoDi.slice(0, 2); //参保地前4位编码
+              let b=  order.CanBaoDi.slice(0, 3); //参保地前3位编码
+              if(a == b){
+                type_name = "本地城乡"
+              }else{
+                if(e == f){
+                  type_name = "省内异地城乡"
+                }else{
+                  type_name = "省外异地城乡"
+                }
+              }
+
+            }else if(order.TypeName == '职工'){
+              // let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+              let a = this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+              let e =  this.config.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+              let f= order.CanBaoDi.slice(0, 2); //参保地前4位编码
+              // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
+              let b=  order.CanBaoDi.slice(0, 3); //参保地前3位编码
+              if(a == b){
+                type_name = "本地职工"
+              }else{
+                if (e == f){
+                  type_name = "省内异地职工"
+                }else{
+                  type_name = "省外异地职工"
+                }
+              }
+            }else{
+              type_name = "自费"
+            }
+
+
+
+            let total = order.Total
+
+            let xt = order.XtCount
+            let xl = order.XlCount
+            let gl = order.GlCount
+
+
+            let obj = {
+              '患者姓名': name,
+              '类型': type_name,
+              "合计次数": total,
+              '血透': xt,
+              "血滤": xl,
+              '灌流': gl,
+              "西药费":order.WesternMedicineFee,
+              "中成药费":order.ChinesePatentMedicineFee,
+              '耗材费': order.HealthMaterialsFee,
+              '挂号费': order.RegistrationFee,
+              '治疗费': order.TreatmentFee,
+              '检查费': order.ExaminationFee,
+              '化验费': order.LaboratoryFee,
+              '护理费': order.NursingFee,
+              '其他费': order.OtherFee,
+              '床位费': order.BedsFee,
+              '诊察费': order.ConsultationFee,
+              '中药饮片费': order.ChineseMedicineFee,
+              '一般诊疗费': order.GeneralTreatmentFee,
+              '合计': order.TotalMedicalFee,
+              '自费金额': order.SelfPay,
+              '个人账户支付': order.AcctPay,
+              '退费': order.Return,
+              '优惠': order.YouHui,
+              '应收': order.YingShou,
+              '挂账': order.GuaZhang,
+              '冲账': order.ChongZhang,
+              '实收': order.ShiShou,
+              '已收': order.YiShou,
+            }
+            list.push(obj)
+          }
+
+          if(list.length > 0){
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
+              const filterVal = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
+
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '收入统计'
+              })
+            })
+          }
+
+
+        }
+      })
+
+
     },
   export_detail() {