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/chargeDetailManagement.vue

@@ -81,6 +81,14 @@
             </el-button>
 
 
+            <el-button
+                v-if="(this.radio == 1 && this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
+                size="small"
+                @click="open(1)"
+                type="primary">上传费用明细
+            </el-button>
+
+
             <el-button
                 v-if="( this.radio == 2 &&this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(2)" type="primary"
@@ -150,7 +158,8 @@
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-                    <span>处方总价：<span style="color:red;">{{ all_total }}元</span></span>
+                    <span v-if="this.radio == 2">处方总价：<span style="color:red;">{{all_total+'元' + ' = 全自费总金额:'+fulamt_ownpay_amt + '元+'  + '超限价总金额:' + overlmt_amt  + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' +  inscp_scp_amt + '元'   }}</span></span>
+                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{all_total }}元</span></span>
 
                     <!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
 <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
@@ -454,8 +463,11 @@ export default {
 
       department: [],
       invoiceVisible: false,
-      invoiceParams: {}
-
+      invoiceParams: {},
+      fulamt_ownpay_amt:'',
+      overlmt_amt:'',
+      preselfpay_amt:'',
+      inscp_scp_amt:'',
     }
   },
   created() {
@@ -851,35 +863,38 @@ export default {
           params['settle_accounts_type'] = 2
 
         }
-        axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
-          params: params
-        })
-            .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)
-                  that.$confirm(response.data.data.msg, '医保错误信息', {
-                    confirmButtonText: '确 定',
-                    type: 'warning'
-                  }).then(() => {
-
-                  }).catch(() => {
-                  })
+        if (this.hisPatientInfo.balance_accounts_type != 2){
+          axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
+            params: params
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
                 } else {
-                  that.$message.success('上传明细成功')
-                  that.radio = 2
-                  that.getPatientList()
-                }
+                  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(function(error) {
+                    }).catch(() => {
+                    })
+                  } else {
+                    that.$message.success('上传明细成功')
+                    that.radio = 2
+                    that.getPatientList()
+                  }
+
+                }
+              })
+              .catch(function(error) {
+              })
+        }else  if (this.hisPatientInfo.balance_accounts_type == 2){
 
-            })
 
+        }
       }
     },
     changeRadio(id) {
@@ -1257,10 +1272,86 @@ export default {
           this.month_total = this.getMonthTotalOne()
           this.all_total = this.getTotal()
           this.all_month_total = this.getTotalTwo()
+          this.fulamt_ownpay_amt = this.getFulamtOwnpayAmtTotal()
+          this.overlmt_amt = this.getOverlmtAmtTotal()
+          this.preselfpay_amt = this.getPreselfpayAmtTotal()
+          this.inscp_scp_amt = this.getInscpScpAmtTotal()
 
 
         }
       })
+    },getFulamtOwnpayAmtTotal(){
+      var total = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].advices != null) {
+          for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].fulamt_ownpay_amt)
+          }
+        }
+        if (this.prescriptions[i].project != null) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].fulamt_ownpay_amt)
+          }
+        }
+
+      }
+      return total.toFixed(2)
+
+    },getOverlmtAmtTotal(){
+      var total = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].advices != null) {
+          for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].overlmt_amt)
+          }
+        }
+        if (this.prescriptions[i].project != null) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].overlmt_amt)
+          }
+        }
+
+      }
+      return total.toFixed(2)
+
+    },getPreselfpayAmtTotal(){
+      var total = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].advices != null) {
+          for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].preselfpay_amt)
+          }
+        }
+        if (this.prescriptions[i].project != null) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].preselfpay_amt)
+          }
+        }
+
+      }
+      return total.toFixed(2)
+
+    },getInscpScpAmtTotal(){
+      var total = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].advices != null) {
+          for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].inscp_scp_amt)
+          }
+        }
+        if (this.prescriptions[i].project != null) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].inscp_scp_amt)
+          }
+        }
+
+      }
+      return total.toFixed(2)
+
     },
     sz_open(index) {
       switch (index) {

src/xt_pages/outpatientCharges/costComparison.vue

@@ -606,7 +606,9 @@ c<template>
         let params = {
           'start_time': this.getTimes(this.selection[0].start_time),
           'end_time': this.getTimes(this.selection[0].end_time),
-          'insutype': this.selection[0].insutype
+          'insutype': this.selection[0].insutype,
+          'clr_type': this.selection[0].clr_type,
+
         }
         getCheckAccountFormData(params).then(response => {
           if (response.data.state == 0) {
@@ -731,8 +733,8 @@ c<template>
                   '门诊费用': this.fromData[i].medfee_sumamt,
                   '医保支付': this.fromData[i].fund_pay_sumamt,
                   '自费': this.fromData[i].psn_cash_pay,
-                  '起付线I': this.fromData[i].act_pay_dedc,
-                  '按比例自付II': this.fromData[i].psn_cash_pay,
+                  '起付线I': this.fromData[i].act_pay_dedc?this.fromData[i].act_pay_dedc:"0.00",
+                  '按比例自付II': this.fromData[i].psn_cash_pay?this.fromData[i].psn_cash_pay:"0.00",
                   "超封顶线费用": "0.00",
                   "合计": parseFloat(this.fromData[i].act_pay_dedc)  + parseFloat(this.fromData[i].psn_cash_pay),
                   '基本统筹基金': this.fromData[i].hifp_pay,
@@ -759,8 +761,8 @@ c<template>
               }
 
               import('@/vendor/Export2Excel').then(excel => {
-                const tHeader = ['序号', '姓名','个人编te号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','医保支付','自费', '起付线', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
-                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','医保支付','自费', '起付线', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const tHeader = ['序号', '姓名','个人编te号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','医保支付','自费', '起付线I', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','医保支付','自费', '起付线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']