src/xt_pages/outpatientCharges/summary.vue

@@ -333,10 +333,9 @@
               size="mini"
               type="primary"
               @click="uploadInfo(scope.row)"
-              v-if="scope.row.order_status == 2 && scope.row.result.id == 0"
+              v-if="scope.row.is_medicine_insurance == 1 && scope.row.order_status == 2 && scope.row.result.id == 0"
             >
               上传结算清单
-
             </el-button>
 
             <el-button

src/xt_pages/outpatientTool/components/allgather.vue

@@ -166,6 +166,8 @@ export default {
           tempPatientsTwo = tempData
 
           let infos = this.unique2(tempPatientsTwo)
+          console.log("infos")
+          console.log(infos)
           let sum = 0
           for (let e = 0; e < infos.length; e++) {
             let obj = {

src/xt_pages/outpatientTool/components/personSettle.vue

@@ -496,45 +496,47 @@ export default {
 
             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){
+              let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+              let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+              let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+              let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+              let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+              let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+              if (e == f) {
+                if (a == b) {
+                  if (c == d) {
+                    type_name = "本地城乡"
+                  } else {
+                    type_name = "省内异地城乡"
+                  }
+                } else {
                   type_name = "省内异地城乡"
-                }else{
-                  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){
+            }else if(order.TypeName == '职工') {
+              let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+              let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+              let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+              let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+              let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+              let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+              if (e == f) {
+                if (a == b) {
+                  if (c == d) {
+                    type_name = "本地职工"
+                  } else {
+                    type_name = "省内异地职工"
+                  }
+                } else {
                   type_name = "省内异地职工"
-                }else{
-                  type_name = "省外异地职工"
                 }
+              } else {
+                type_name = "省外异地职工"
               }
-            }else{
-              type_name = "自费"
             }
-
-
-
             let total = order.Total
 
             let xt = order.XtCount
@@ -563,6 +565,8 @@ export default {
               '中药饮片费': order.ChineseMedicineFee,
               '一般诊疗费': order.GeneralTreatmentFee,
               '合计': order.TotalMedicalFee,
+              "医保基金支付金额":order.Func,
+              "医保统筹基金支出":order.TC,
               '自费金额': order.SelfPay,
               '个人账户支付': order.AcctPay,
               '退费': order.Return,
@@ -578,8 +582,8 @@ export default {
 
           if(list.length > 0){
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
-              const filterVal = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
+              const tHeader = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计","医保基金支付金额", "医保统筹基金支出","自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
+              const filterVal = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计","医保基金支付金额","医保统筹基金支出", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
 
               const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({