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

src/xt_pages/outpatientCharges/costComparison.vue

             return false
           } else {
             this.fromData = response.data.data.list
-            var list = []
-
-            for (let i = 0; i < this.fromData.length; i++) {
-              let obj = {
-                '序号': i+1,
-                '姓名': this.fromData[i].psn_name,
-                '单位名称': this.fromData[i].psn_name,
-                '个人编号': this.fromData[i].psn_no,
-                '门诊号': this.fromData[i].mdtrt_id,
-                '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
-                '挂号科室': "",
-                '门诊费用': this.fromData[i].medfee_sumamt,
-                '自费': this.fromData[i].psn_cash_pay,
-                '起付线I': this.fromData[i].act_pay_dedc,
-                '按比例自付II': this.fromData[i].psn_cash_pay,
-                '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
-                '统筹基金': this.fromData[i].fund_pay_sumamt,
-                '公务员补助': this.fromData[i].cvlserv_pay,
-                '单位补充保险': this.fromData[i].hifes_pay,
-                '煤矿补充保险': "0.00",
-                "超封顶线费用": "0.00",
-                '大额医疗保险应付': this.fromData[i].hifob_pay,
-                '透析补助': "0.00",
-                '大额合计':  "0.00",
-                '实账支付额': "0.00",
-                '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
-                "血透次数":this.fromData[i].DialysisCount,
-                "置留管数量":0,
-                "备注":"",
 
+            if(this.selection[0].insutype == "310"){
+
+              var list = []
+              for (let i = 0; i < this.fromData.length; i++) {
+                // var hifmi_pay = 0.00;
+                //
+                // if(this.fromData[i].setl_detail.length > 0){
+                //   var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                //   for (let i = 0; i < jsonObj.length; i++) {
+                //     if (order.fund_pay_type == '310300') {
+                //       hifmi_pay = jsonObj[i].fund_payamt
+                //     }
+                //   }
+                // }
+
+                var hifes_pays = [];
+
+                if(this.fromData[i].setl_detail.length > 0){
+                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                  console.log(jsonObj)
+                  for (let i = 0; i < jsonObj.length; i++) {
+                    if (jsonObj[i].fund_pay_type == '310100') {
+                      hifes_pays.push(jsonObj[i].fund_payamt)
+                    }
+                  }
+                }
+
+                let hifes_pay = 0.00
+                if(hifes_pays.length == 2){
+                  hifes_pay = hifes_pays[1]
+                }
+
+                let obj = {
+                  '序号': i+1,
+                  '姓名': this.fromData[i].psn_name,
+                  '单位名称': this.fromData[i].psn_name,
+                  '个人编号': this.fromData[i].psn_no,
+                  '门诊号': this.fromData[i].mdtrt_id,
+                  '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                  '挂号科室':  "血透室",
+                  '门诊费用': this.fromData[i].medfee_sumamt,
+                  '自费': this.fromData[i].psn_cash_pay,
+                  '起付线I': this.fromData[i].act_pay_dedc,
+                  '按比例自付II': this.fromData[i].psn_cash_pay,
+                  '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
+                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  '公务员补助': this.fromData[i].cvlserv_pay,
+                  '单位补充保险': hifes_pay,
+                  '煤矿补充保险': "0.00",
+                  "超封顶线费用": "0.00",
+                  '大额医疗保险应付': this.fromData[i].hifob_pay,
+                  '透析补助': "0.00",
+                  '大额合计':  "0.00",
+                  '实账支付额': "0.00",
+                  '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
+                  "血透次数":this.fromData[i].DialysisCount,
+                  "置留管数量":0,
+                  "备注":"",
+
+                }
+                list.push(obj)
+              }
+              var insutype_name = ''
+              if (this.query_insutype == '310') {
+                insutype_name = '职工基本医疗保险'
+              } else if (this.query_insutype == '390') {
+                insutype_name = '城乡居民基本医疗保险'
               }
-              list.push(obj)
-            }
-            var insutype_name = ''
-            if (this.query_insutype == '310') {
-              insutype_name = '职工基本医疗保险'
-            } else if (this.query_insutype == '390') {
-              insutype_name = '城乡居民基本医疗保险'
-            }
 
-            import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
-              const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
-              // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
-              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
-
-              const data = this.formatJson(filterVal, list)
-              excel.export_json_to_excel({
-                header: tHeader,
-                data,
-                filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+                const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+                })
               })
-            })
+
+
+            }else{
+
+              var list = []
+              for (let i = 0; i < this.fromData.length; i++) {
+
+                var hifmi_pay = 0.00;
+
+                if(this.fromData[i].setl_detail.length > 0){
+                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                  console.log(jsonObj)
+                  for (let i = 0; i < jsonObj.length; i++) {
+                      if (jsonObj[i].fund_pay_type == '390200') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
+                  }
+                }
+
+
+
+
+                let obj = {
+                  '序号': i+1,
+                  '姓名': this.fromData[i].psn_name,
+                  '个人编号': this.fromData[i].psn_no,
+                  '门诊号': this.fromData[i].mdtrt_id,
+                  '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                  '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
+                  '挂号科室': "血透室",
+                  '门诊费用': this.fromData[i].medfee_sumamt,
+                  '自费': this.fromData[i].psn_cash_pay,
+                  '起付线': this.fromData[i].act_pay_dedc,
+                  '按比例自付': this.fromData[i].psn_cash_pay,
+                  "超封顶线费用": "0.00",
+                  "合计": parseFloat(this.fromData[i].act_pay_dedc) + parseFloat(this.fromData[i].psn_cash_pay),
+                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  '大病保险': hifmi_pay,
+                  '医疗救助': this.fromData[i].maf_pay,
+                  '实账支付额': "0.00",
+                  "血透次数":this.fromData[i].DialysisCount,
+                  "置留管数量":0,
+                  "备注":"",
+
+                }
+
+
+
+
+
+                list.push(obj)
+              }
+              var insutype_name = ''
+              if (this.query_insutype == '310') {
+                insutype_name = '职工基本医疗保险'
+              } else if (this.query_insutype == '390') {
+                insutype_name = '城乡居民基本医疗保险'
+              }
+
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['序号', '姓名','个人编号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+                const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+                })
+              })
+
+
+
+
+
+
+            }
+
+
           }
         })
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
-
-            var that = this
-            this.$confirm('是否退费', '退费', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'order_id': this.order.id,
-                'number': this.order.number,
-                'patient_id': this.patientInfo.id,
-                'record_time': this.record_date,
-                'admin_user_id': this.$store.getters.xt_user.user.id,
-                'org_id': this.$store.getters.xt_user.org_id
+          if(that.hisPatientInfo.balance_accounts_type == 2){
+            let params = {
+              'order_id': that.order.id,
+              'number': that.order.number,
+              'patient_id': that.patientInfo.id,
+              'record_time': that.record_date
 
+            }
+            Refund(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                this.loadingtwo = false
+                return false
+              } else {
+                this.radio = 1
+                this.changeRadioAndPatient(1)
+                this.$message({ message: '退费成功', type: 'success' })
+                this.loadingtwo = false
               }
-              axios.get('http://127.0.0.1:9532/api/refund/post', {
-                params: params
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    that.loadingtwo = false
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
+            })
 
-                      }).catch(() => {
-                      })
+          }else {
+            if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
 
-                    } else {
-                      that.changeRadioAndPatient(1)
-                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
-                      that.loadingtwo = false
-                    }
+              var that = this
+              this.$confirm('是否退费', '退费', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+              }).then(() => {
+                let params = {
+                  'order_id': this.order.id,
+                  'number': this.order.number,
+                  'patient_id': this.patientInfo.id,
+                  'record_time': this.record_date,
+                  'admin_user_id': this.$store.getters.xt_user.user.id,
+                  'org_id': this.$store.getters.xt_user.org_id
 
-                  }
+                }
+                axios.get('http://127.0.0.1:9532/api/refund/post', {
+                  params: params
                 })
-                .catch(function(error) {
+                  .then(function(response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      that.loadingtwo = false
+                      return false
+                    } else {
+                      if (response.data.data.failed_code == -10) {
+                        // that.$message.error(response.data.data.msg)
+                        that.$confirm(response.data.data.msg, '医保错误信息', {
+                          confirmButtonText: '确 定',
+                          type: 'warning'
+                        }).then(() => {
 
-                })
+                        }).catch(() => {
+                        })
 
-            }).catch(() => {
+                      } else {
+                        that.changeRadioAndPatient(1)
+                        that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                        that.loadingtwo = false
+                      }
 
-            })
+                    }
+                  })
+                  .catch(function(error) {
 
-          } else {
+                  })
 
-            this.$confirm('是否退费', '退费', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'order_id': this.order.id,
-                'number': this.order.number,
-                'patient_id': this.patientInfo.id,
-                'record_time': this.record_date
+              }).catch(() => {
 
-              }
-              Refund(params).then(response => {
-                if (response.data.state == 0) {
-                  this.$message.error(response.data.msg)
-                  this.loadingtwo = false
-                  return false
-                } else {
-                  this.radio = 1
-                  this.changeRadioAndPatient(1)
-                  this.$message({ message: '退费成功', type: 'success' })
-                  this.loadingtwo = false
+              })
+
+            } else {
+
+              this.$confirm('是否退费', '退费', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+              }).then(() => {
+                let params = {
+                  'order_id': this.order.id,
+                  'number': this.order.number,
+                  'patient_id': this.patientInfo.id,
+                  'record_time': this.record_date
 
                 }
-              })
+                Refund(params).then(response => {
+                  if (response.data.state == 0) {
+                    this.$message.error(response.data.msg)
+                    this.loadingtwo = false
+                    return false
+                  } else {
+                    this.radio = 1
+                    this.changeRadioAndPatient(1)
+                    this.$message({ message: '退费成功', type: 'success' })
+                    this.loadingtwo = false
 
-            }).catch(() => {
+                  }
+                })
 
-            })
+              }).catch(() => {
 
-          }
+              })
 
+            }
+          }
         } else if (index == 6) {
 
           // if (this.patientInfo.id == 0) {
               cancelButtonText: '取 消',
               type: 'warning'
             }).then(() => {
-              axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
-                params: {
-                  order_id: this.order.id,
-                  record_time: this.record_date,
-                  his_patient_id: this.hisPatientInfo.id,
-                  admin_user_id: this.$store.getters.xt_user.user.id,
-                  patient_id: this.patientInfo.id
+              if(that.hisPatientInfo.balance_accounts_type == 2){
+                let params = {
+                  'order_id': that.order.id,
+                  'number': that.order.number,
+                  'patient_id': that.patientInfo.id,
+                  'record_time': that.record_date
+
                 }
-              })
-                .then(function(response) {
+                Refund(params).then(response => {
                   if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
+                    this.$message.error(response.data.msg)
+                    this.loadingtwo = false
                     return false
                   } else {
-                    if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
-
-                    } else {
-                      that.changeRadioAndPatient(1)
-                      that.$message({ message: '退费成功', type: 'success' })
-                    }
+                    this.radio = 1
+                    this.changeRadioAndPatient(1)
+                    this.$message({ message: '退费成功', type: 'success' })
+                    this.loadingtwo = false
                   }
                 })
-                .catch(function(error) {
+
+              }else{
+
+                axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
+                  params: {
+                    order_id: this.order.id,
+                    record_time: this.record_date,
+                    his_patient_id: this.hisPatientInfo.id,
+                    admin_user_id: this.$store.getters.xt_user.user.id,
+                    patient_id: this.patientInfo.id
+                  }
                 })
+                  .then(function(response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      return false
+                    } else {
+                      if (response.data.data.failed_code == -10) {
+                        that.$message.error(response.data.data.msg)
+
+                      } else {
+                        that.changeRadioAndPatient(1)
+                        that.$message({ message: '退费成功', type: 'success' })
+                      }
+                    }
+                  })
+                  .catch(function(error) {
+                  })
+
+
+              }
+
             }).catch(() => {
             })
             break