Skip to content

省
省二结算
Commit b7851835 authored by 任鸿志's avatar 任鸿志
Browse files
Options

refactor(env): 更新 API 地址并调整患者信息展示 

- 更新 VUE_APP_BASE_URL 和 VUE_APP_BASE_URL_SFC 的地址
- 修改患者信息展示逻辑，使用新的字段名称
- 调整结算确认页面的显示内容
- 优化发票打印功能，修改请求方法
parent c640941d
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 44 deletions
.env.development
View file @ b7851835
...@@ -8,12 +8,12 @@ NODE_ENV = 'development' ...@@ -8,12 +8,12 @@ NODE_ENV = 'development'
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://192.169.24.231:8002' # VUE_APP_BASE_URL = 'http://192.169.24.231:8002'
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902' VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
# VUE_APP_BASE_URL = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
# VUE_APP_BASE_URL = 'http://10.10.9.219:8802' # VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902' VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
# VUE_APP_BASE_URL_SFC = 'http://10.10.40.69:9903' # VUE_APP_BASE_URL_SFC = 'http://10.10.40.69:9903'
# VUE_APP_BASE_URL = 'http://192.169.4.171:8002' # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
# VUE_APP_BASE_URL = 'http://10.10.40.10:8099' # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'
......
src/api/changeFree.js
View file @ b7851835
...@@ -20,8 +20,8 @@ export function outinvoicing (data) { ...@@ -20,8 +20,8 @@ export function outinvoicing (data) {
export function printInvoiceDetails (data) { export function printInvoiceDetails (data) {
return requestChange({ return requestChange({
url: Vue.prototype.$api.jiesuan.printInvoiceDetails, url: Vue.prototype.$api.jiesuan.printInvoiceDetails,
method: 'post', method: 'get',
data params:data
}) })
} }
......
src/components/invoicepost/index.vue
View file @ b7851835
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
patientId: this.outinvoicform.patientId, patientId: this.outinvoicform.patientId,
rcptNo: this.outinvoicform.rcpt_no, rcptNo: this.outinvoicform.rcpt_no,
} }
setLoading(true) // setLoading(true)
const { code, message } = await printInvoiceDetails(params) const { code, message } = await printInvoiceDetails(params)
if (code == 200) { if (code == 200) {
this.$message({ this.$message({
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
} }
} catch (error) { } catch (error) {
} finally { } finally {
setLoading(false) // setLoading(false)
} }
}, },
// // 关闭弹窗 // // 关闭弹窗
......
src/views/jiesuan/outpatientCharging.vue
View file @ b7851835
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
<div class="userInfo_div" v-if="patientData.name"> <div class="userInfo_div" v-if="patientData.name">
<div class="userInfo_div_1"> <div class="userInfo_div_1">
<div class="userInfo_name">{{ patientData.name || '' }}</div> <div class="userInfo_name">{{ patientData.name || '' }}</div>
<div class="userInfo_sex">{{ patientData.sex ? patientData.sex : '' }}</div> <div class="userInfo_sex">{{ patientData.sex ? patientData.sex.name : '' }}</div>
<div class="userInfo_age">{{ patientData.age }}岁</div> <div class="userInfo_age">{{ patientData.age }}岁</div>
<div class="yibaoInfo_div"> <div class="yibaoInfo_div">
<div class="yibaoInfo_div_1">{{ patientData.insuranceType }}</div> <div class="yibaoInfo_div_1">{{ patientData.cbd_type_name }}</div>
<!-- <div class="yibaoInfo_div_1">{{ patientData.cbd_type=='1'?'济南':patientData.cbd_type=='2'?'省直':patientData.cbd_type=='3'?'省内异地':patientData.cbd_type=='4'?'省外异地':patientData.cbd_type=='0'?'自费':'' }}</div> --> <!-- <div class="yibaoInfo_div_1">{{ patientData.cbd_type=='1'?'济南':patientData.cbd_type=='2'?'省直':patientData.cbd_type=='3'?'省内异地':patientData.cbd_type=='4'?'省外异地':patientData.cbd_type=='0'?'自费':'' }}</div> -->
</div> </div>
<div class="yibaoInfo_div_2">就诊卡：{{ patientData.patientId }}</div> <div class="yibaoInfo_div_2">就诊卡：{{ patientData.patient_id }}</div>
<div class="yibaoInfo_div_2">身份证号：{{ patientData.idNo }}</div> <div class="yibaoInfo_div_2">身份证号：{{ patientData.id_card }}</div>
<div class="yibaoInfo_div_2">手机号：{{ patientData.nextOfKinPhone }}</div> <div class="yibaoInfo_div_2">手机号：{{ patientData.phone }}</div>
<div class="yibaoInfo_div_2">余额：{{ patientData.balance ?patientData.balance: '0.00' }}</div> <div class="yibaoInfo_div_2">余额：{{ patientData.balance }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<div slot="title"> <div slot="title">
<span class="titles" style="color: #484848">结算确认</span <span class="titles" style="color: #484848">结算确认</span
><span style="color: #666666" ><span style="color: #666666"
>（ 姓名：{{ patientData.name }} <span style="margin: 0px 10px"> 门诊号码: {{ patientData.patientId }} </span>病人ID：{{ patientData.patientId }} >（ 姓名：{{ patientData.name }} <span style="margin: 0px 10px"> 门诊号码: {{ patientData.patient_id }} </span>病人ID：{{ patientData.id_card }}
）<span style="color: red">{{ ）<span style="color: red">{{
man_name == '1' man_name == '1'
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-form-item> <el-form-item>
<div class="form_item"> <div class="form_item">
<el-tag class="label" color="#E7EEFF">人员类别</el-tag> <el-tag class="label" color="#E7EEFF">人员类别</el-tag>
<el-input v-model="patientData.insuranceType" disabled></el-input> <el-input v-model="patientData.type.name" disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<el-form-item> <el-form-item>
<div class="form_item"> <div class="form_item">
<el-tag class="label" color="#E7EEFF">身份证号</el-tag> <el-tag class="label" color="#E7EEFF">身份证号</el-tag>
<el-input v-model="patientData.idNo" disabled></el-input> <el-input v-model="patientData.id_card" disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -664,7 +664,7 @@ import Readcards from '@/components/ReadcardsSFC' ...@@ -664,7 +664,7 @@ import Readcards from '@/components/ReadcardsSFC'
import editProp1 from './components/editProp' //修改自付比例 import editProp1 from './components/editProp' //修改自付比例
import { pdxx, mzxx, mzxxs, mzxxs_ewm, pdxq, info, bxxx, prescription, serviceInvoke, jsxx, hiscard, printmis, queryReadRard, verifyFeeStatus,diagnosis } from '@/api/mzSFC' import { pdxx, mzxx, mzxxs, mzxxs_ewm, pdxq, info, bxxx, prescription, serviceInvoke, jsxx, hiscard, printmis, queryReadRard, verifyFeeStatus,diagnosis } from '@/api/mzSFC'
import { get_serial_number, editProp, zfbl, freemoney, settlementPre, familybalanceinfor, patient, settleSelfPre, selfPre, yundaMis, familyBalance, get_zfbl } from '@/api/jiesuanSFC' import { get_serial_number, editProp, zfbl, freemoney, settlementPre, familybalanceinfor, patient, settleSelfPre, selfPre, yundaMis, familyBalance, get_zfbl } from '@/api/jiesuanSFC'
import { recharge,findPatMasterIndexByReadCard } from '@/api/changeFree' import { recharge } from '@/api/changeFree'
import printProof from '../../utils/print_proof' import printProof from '../../utils/print_proof'
import getLodop from '../../assets/js/LodopFuncs' import getLodop from '../../assets/js/LodopFuncs'
import SelectCard from '@/components/SelectCardSFC' import SelectCard from '@/components/SelectCardSFC'
...@@ -1319,7 +1319,7 @@ export default { ...@@ -1319,7 +1319,7 @@ export default {
this.gz_name = false this.gz_name = false
var obj = { var obj = {
channel: this.channel, channel: this.channel,
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
} }
pdxq(obj) pdxq(obj)
.then(response => { .then(response => {
...@@ -1336,7 +1336,7 @@ export default { ...@@ -1336,7 +1336,7 @@ export default {
async getdiagnosis(){ async getdiagnosis(){
this.diagnosisData='' this.diagnosisData=''
await diagnosis({ await diagnosis({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
visit_no:this.selectTableArr[0].visit_no visit_no:this.selectTableArr[0].visit_no
}) })
.then(response => { .then(response => {
...@@ -1364,10 +1364,10 @@ export default { ...@@ -1364,10 +1364,10 @@ export default {
} }
}) })
// 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核] // 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核]
if ((this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) || (this.patientData.insuranceType == '省直职工' && this.man_name != '1' && this.man_name != '3' && this.man_name != '5')) { if ((this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) || (this.patientData.insurance_type.value == 'PROVINCE' && this.man_name != '1' && this.man_name != '3' && this.man_name != '5')) {
this.yujiesuanLoading = true this.yujiesuanLoading = true
const { code, data } = await verifyFeeStatus({ const { code, data } = await verifyFeeStatus({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
serial_no: this.cost_id.toString(), serial_no: this.cost_id.toString(),
}) })
if (code == 200) { if (code == 200) {
...@@ -1603,7 +1603,7 @@ export default { ...@@ -1603,7 +1603,7 @@ export default {
operatorNo: this.jobNumber, operatorNo: this.jobNumber,
payType: this.payTypeData == '1' ? 'cumsNative' : this.payTypeData == '5' ? 'cash' : this.payTypeData == '2' ? '智慧医保' : '', // 支付类型 cumsNative 聚合支付 cash 现金 payType: this.payTypeData == '1' ? 'cumsNative' : this.payTypeData == '5' ? 'cash' : this.payTypeData == '2' ? '智慧医保' : '', // 支付类型 cumsNative 聚合支付 cash 现金
rechargeType: 0, // 是否预交金充值 1是 0否, rechargeType: 0, // 是否预交金充值 1是 0否,
patientId: this.patientData.patientId, patientId: this.patientData.patient_id,
deptCode: this.dept, deptCode: this.dept,
}, },
sy: this.is_sy, sy: this.is_sy,
...@@ -1615,7 +1615,7 @@ export default { ...@@ -1615,7 +1615,7 @@ export default {
// source_pay_amount: this.source_pay_amount, // source_pay_amount: this.source_pay_amount,
// tradeNo: this.payData?.tradeNo, // tradeNo: this.payData?.tradeNo,
family_type: this.familyType, family_type: this.familyType,
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
personal_pay: this.bxxxinfo.grzhzf, personal_pay: this.bxxxinfo.grzhzf,
family_pay: this.bxxxinfo.gjzhzf, family_pay: this.bxxxinfo.gjzhzf,
cash_pay: this.bxxxinfo.his_deduct_amount, cash_pay: this.bxxxinfo.his_deduct_amount,
...@@ -1738,7 +1738,7 @@ export default { ...@@ -1738,7 +1738,7 @@ export default {
if (array.length != 0) { if (array.length != 0) {
info({ info({
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
}) })
.then(response => { .then(response => {
...@@ -1777,7 +1777,7 @@ export default { ...@@ -1777,7 +1777,7 @@ export default {
if (array.length != 0) { if (array.length != 0) {
info({ info({
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
}) })
.then(response => { .then(response => {
...@@ -1816,7 +1816,7 @@ export default { ...@@ -1816,7 +1816,7 @@ export default {
if (array.length != 0) { if (array.length != 0) {
info({ info({
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
}) })
.then(response => { .then(response => {
...@@ -1887,10 +1887,10 @@ export default { ...@@ -1887,10 +1887,10 @@ export default {
//获取自付比例 //获取自付比例
getProp(row) { getProp(row) {
get_zfbl({ get_zfbl({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
item_code: row.item_code, item_code: row.item_code,
//yltclb:row.settle_type.is_mb==true?'4':'6', //yltclb:row.settle_type.is_mb==true?'4':'6',
rqlb: this.is_sy ? 'E' : this.patientData.rqlb, rqlb: this.is_sy ? 'E' : this.patientData.crowd_type,
//xzbz:row.settle_type.is_gs==true?'D':'C', //xzbz:row.settle_type.is_gs==true?'D':'C',
settle_type: row.settle_type.code, settle_type: row.settle_type.code,
}) })
...@@ -1936,18 +1936,12 @@ export default { ...@@ -1936,18 +1936,12 @@ export default {
}) })
}, },
selectCardYiboInfo(e) { selectCardYiboInfo(e) {
findPatMasterIndexByReadCard({ patient({
cardNo: e ? e.sfzh : '', card_no: this.cardNo,
cardType: "4", card_type: this.cardType,
idNo:e ? e.sfzh : '', id_card: e ? e.sfzh : '',
operatorId: "8915",
patientId: "",
// card_no: this.cardNo,
// card_type: this.cardType,
// id_card: e ? e.sfzh : '',
}) })
.then(response => { .then(response => {
console.log(response.data,'ooooooooooo')
this.patientData = response.data this.patientData = response.data
this.getWaiting() this.getWaiting()
}) })
...@@ -1970,7 +1964,7 @@ export default { ...@@ -1970,7 +1964,7 @@ export default {
this.YBData.yfdxbzName=data.yfdxbz=='1'?'优抚对象' : '无'; this.YBData.yfdxbzName=data.yfdxbz=='1'?'优抚对象' : '无';
// 验证违规 // 验证违规
prescription({ prescription({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
prescription_nos: this.cost_id, prescription_nos: this.cost_id,
js_type: '1', js_type: '1',
...@@ -2038,7 +2032,7 @@ export default { ...@@ -2038,7 +2032,7 @@ export default {
: this.selectTableArr[0]?.settle_type.is_mb : this.selectTableArr[0]?.settle_type.is_mb
? zhenduan ? zhenduan
: '', : '',
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
cache_key: data.cache_key, cache_key: data.cache_key,
prescription_nos: this.cost_id, prescription_nos: this.cost_id,
is_mt: this.man_name == '5' ? true :this.man_name == '4' ? true : this.man_name == '3' ? false : this.man_name == '2' ? true : this.selectTableArr[0] ? this.selectTableArr[0].settle_type.is_mt : '', is_mt: this.man_name == '5' ? true :this.man_name == '4' ? true : this.man_name == '3' ? false : this.man_name == '2' ? true : this.selectTableArr[0] ? this.selectTableArr[0].settle_type.is_mt : '',
...@@ -2058,7 +2052,7 @@ export default { ...@@ -2058,7 +2052,7 @@ export default {
// this.GSshow = true // this.GSshow = true
// } // }
await familybalanceinfor({ await familybalanceinfor({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
pre_key: res.data.pre_key, pre_key: res.data.pre_key,
cache_key: this.form.cache_key, cache_key: this.form.cache_key,
}).then(async res2 => { }).then(async res2 => {
...@@ -2143,7 +2137,7 @@ export default { ...@@ -2143,7 +2137,7 @@ export default {
this.source_pay_amount = 0 this.source_pay_amount = 0
this.form = {} this.form = {}
await settleSelfPre({ await settleSelfPre({
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
prescription_nos: this.cost_id, prescription_nos: this.cost_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
channel: this.channel, channel: this.channel,
...@@ -2258,7 +2252,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo. ...@@ -2258,7 +2252,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.
</div> </div>
<div style="margin:-5px 0px 0px 18px;position: relative"> <div style="margin:-5px 0px 0px 18px;position: relative">
<div class="conline"><span>姓名:</span><span class="money">${this.patientData.name}</span></div> <div class="conline"><span>姓名:</span><span class="money">${this.patientData.name}</span></div>
<div class="conline"><span>性别:</span><span class="money">${this.patientData.sex ? this.patientData.sex : ''}</span></div> <div class="conline"><span>性别:</span><span class="money">${this.patientData.sex ? this.patientData.sex.name : ''}</span></div>
<div class="conline"><span>年龄:</span><span class="money">${this.patientData.age}</span></div> <div class="conline"><span>年龄:</span><span class="money">${this.patientData.age}</span></div>
<div class="conline"><span>就诊卡号：</span><span class="money">${e.id_card}</span></div> <div class="conline"><span>就诊卡号：</span><span class="money">${e.id_card}</span></div>
<div class="conline"><span>交易方式:</span><span class="money">${e.trade_type}</span></div> <div class="conline"><span>交易方式:</span><span class="money">${e.trade_type}</span></div>
...@@ -2342,7 +2336,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo. ...@@ -2342,7 +2336,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.
operatorNo: this.jobNumber, operatorNo: this.jobNumber,
payType: this.payTypeData == '1' ? 'cumsNative' : this.payTypeData == '5' ? 'cash' : this.payTypeData == '2' ? '智慧医保' : '', // 支付类型 cumsNative 聚合支付 cash 现金 payType: this.payTypeData == '1' ? 'cumsNative' : this.payTypeData == '5' ? 'cash' : this.payTypeData == '2' ? '智慧医保' : '', // 支付类型 cumsNative 聚合支付 cash 现金
rechargeType: 0, // 是否预交金充值 1是 0否, rechargeType: 0, // 是否预交金充值 1是 0否,
patientId: this.patientData.patientId, patientId: this.patientData.patient_id,
deptCode: this.dept, deptCode: this.dept,
}, },
// source_type: this.payData?.targetSys, // source_type: this.payData?.targetSys,
...@@ -2351,7 +2345,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo. ...@@ -2351,7 +2345,7 @@ if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.
// xj_amount: this.xj_amount, // xj_amount: this.xj_amount,
// source_pay_amount: this.source_pay_amount, // source_pay_amount: this.source_pay_amount,
// tradeNo: this.payData.tradeNo, // tradeNo: this.payData.tradeNo,
patient_id: this.patientData.patientId, patient_id: this.patientData.patient_id,
personal_pay: this.bxxxinfo.grzhzf, personal_pay: this.bxxxinfo.grzhzf,
family_pay: this.bxxxinfo.gjzhzf, family_pay: this.bxxxinfo.gjzhzf,
cash_pay: this.bxxxinfo.his_deduct_amount, cash_pay: this.bxxxinfo.his_deduct_amount,
......
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