Commit bfc7f230 authored by 任鸿志's avatar 任鸿志

refactor(outpatientCharging): 优化结算逻辑和数据处理

- 完善公共基金支付金额的空值检查
- 移除不必要的注释代码
- 优化预计结算过程中的数据处理
- 调整对话框显示逻辑
parent baff0df9
......@@ -1057,7 +1057,7 @@ export default {
if (this.bxxxinfo.his_deduct_amount == '') {
this.bxxxinfo.his_deduct_amount = 0
}
if (this.bxxxinfo.gjzhzf == '') {
if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.gjzhzf == undefined || this.bxxxinfo.gjzhzf == 'undefined' || this.bxxxinfo.gjzhzf == 'null') {
this.bxxxinfo.gjzhzf = 0
}
if (this.bxxxinfo.grzhzf == '') {
......@@ -1905,7 +1905,7 @@ export default {
if (this.man_name == '2' || this.man_name == '3' || this.man_name == '1') {
zhenduan = ''
} else {
//this.zhenduanData=this.moreshowdata.data.mzdbjbs_arr.filter(item => item.code === zhenduan)[0].name
//this.zhenduanData=this.moreshowdata.data.mzdbjbs_arr.filter(item => item.code === zhenduan)[0].nameyujiesuanLoading
}
this.yujiesuanLoading = true
......@@ -2014,11 +2014,10 @@ export default {
}
}
}
if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null) {
if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.gjzhzf == undefined || this.bxxxinfo.gjzhzf == 'undefined' || this.bxxxinfo.gjzhzf == 'null') {
this.bxxxinfo.gjzhzf = 0
}
this.form.djf = this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) //this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2)
// this.form.djf=0
this.dialogVisible = true
// 验证违规
prescription({
......@@ -2028,22 +2027,17 @@ export default {
js_type: '1',
p_jbbm: zhenduan,
}).then(response => {
// if (response.data.result.length > 0) {
// this.weiguiList = response.data.result
// this.weiguiData = response.data.result
// // this.ViolationShow = true
// } else {
// }
})
})
})
.catch(err => {
// this.yibaoshowNew=false
this.moreLoading = false
this.yujiesuanLoading = false
})
.finally(() => {
// this.yibaoshowNew=false
this.yujiesuanLoading = false
this.closeSelectCard()
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment