{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
- {{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}
diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue
index 0c87aeb..1e84d58 100644
--- a/src/components/doctorCheck/QueueCheckList.vue
+++ b/src/components/doctorCheck/QueueCheckList.vue
@@ -353,12 +353,12 @@ export default {
// "patientRegisterId": "3a143cf9-0b1b-7765-a90a-b087c4aad1b9",
// "patientRegisterNo": "003485"
- // 叫号即调人员信息出来
- if (row.patientRegisterNo) {
- this.dataTransOpts.tableS.patient_register.patientRegisterNo =
- row.patientRegisterNo;
- this.dataTransOpts.refresh.patient_register.S++;
- }
+ // 叫号即调人员信息出来 (石家庄屏蔽，后续考滤用参数控制)
+ // if (row.patientRegisterNo) {
+ // this.dataTransOpts.tableS.patient_register.patientRegisterNo =
+ // row.patientRegisterNo;
+ // this.dataTransOpts.refresh.patient_register.S++;
+ // }
if (row.queueRegisterId && completeFlag != "9") {
postapi("/api/app/QueueRegister/UpdateQueueRegisterStatus", {
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 3302452..ce44378 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -152,27 +152,10 @@
-
-
+
-
+
-
+
-
+
-
+
-
取消
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 1772e06..983f0aa 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -432,15 +432,15 @@
![]()
-
-
+
-
+
未收费
已收费
已退费
{{ moment(scope.row.lastTime).format("yyyy-MM-DD") }}
{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
{{ dddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
{{ moment(scope.row.birthDate).format("yyyy-MM-DD") }}
{{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
{{ qrCode.barcodeNo + ' ' + qrCode.patientName }}
- 条码号
-
-
+ 条码号
+
- -->
- 条码号
-
-
发票号
-
@@ -117,18 +118,16 @@
@@ -392,10 +391,10 @@ export default {
patientName: '',
},//查询条件
- info:{
+ info: {
patientRegisterNo: '',
patientNo: '',
- patientName:''
+ patientName: ''
},
patientList: [],//人员列表
@@ -484,13 +483,13 @@ export default {
//挂载完成
mounted() {
this.enterToQuery()
-
- if (this.patientRegisterNo){
+
+ if (this.patientRegisterNo) {
this.query.patientRegisterNo = this.patientRegisterNo
- this.query.chargeFlag = 'N'
+ this.query.chargeFlag = 'N'
}
-
- this.btnQuery();
+
+ this.btnQuery();
},
@@ -549,24 +548,24 @@ export default {
//console.log('query', this.query);
- if(this.query.patientRegisterNo){
+ if (this.query.patientRegisterNo) {
body = { patientRegisterNo: this.query.patientRegisterNo };
- }else if(this.query.patientNo){
+ } else if (this.query.patientNo) {
body = { patientNo: this.query.patientNo };
- }else if(this.query.invoiceNo && this.query.chargeFlag != 'N'){
+ } else if (this.query.invoiceNo && this.query.chargeFlag != 'N') {
body = { invoiceNo: this.query.invoiceNo };
- }else{
+ } else {
if (this.query.startDate && this.query.endDate) {
body.startDate = moment(this.query.startDate).format("yyyy-MM-DD")
- body.endDate = moment(this.query.endDate).format("yyyy-MM-DD")
+ body.endDate = moment(this.query.endDate).format("yyyy-MM-DD")
if (body.startDate > body.endDate) {
this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
return
}
- if(this.query.patientName) body.patientName = this.query.patientName
+ if (this.query.patientName) body.patientName = this.query.patientName
}
}
-
+
switch (this.query.chargeFlag) {
case 'Y':
//已收费
@@ -747,6 +746,7 @@ export default {
this.cardSeq = index
this.cardDatas = [] //清除原来的卡列表数据
this.queryCard.value = ''
+ this.cardChoosed = {}
this.winDialog.queryCard = true // 显示选卡页面
},
@@ -778,6 +778,10 @@ export default {
// 确定选中卡记录
btnOkCard() {
+ if(!this.cardChoosed.id){
+ this.$message.warning({showClose:true,message:'请选择会员卡'})
+ return
+ }
// 单次收费不允重复同一张卡
let lfind = arrayExistObj(this.chargePays, 'cardRegisterId', this.cardChoosed.id)
if (lfind > -1) {
@@ -971,19 +975,28 @@ export default {
});
//this.form.preTotal = totalPlan;
//明细和与总金额不符处理
- this.handleBalance(totalPlan, totalCompute);
+ this.handleBalance(totalPlan, Math.round(100 * totalCompute) / 100);
this.findBalance()
},
- //明细合计金额与总金额不一致时，处理
+ // 明细合计金额与总金额不一致时，处理
handleBalance(totalPlan, totalCompute) {
if (totalPlan != totalCompute) {
- for (let i = this.selectedData.length - 1; i = 0; i--) {
- lfind = lfind = arrayExistObj(this.asbItemsForFee, 'id', this.selectedData[i].id);
- if (lfind > -1 && this.selectedData[i].amount == 1) {
- this.asbItemsForFee[lfind].chargePrice = this.asbItemsForFee[lfind].chargePrice + totalPlan - totalCompute;
- this.selectedData[i].chargePrice = this.asbItemsForFee[lfind].chargePrice;
+ //console.log('明细合计金额与总金额不一致时', totalPlan, totalCompute, this.selectedData)
+ for (let i = this.selectedData.length - 1; i >= 0; i--) {
+ // lfind = arrayExistObj(this.asbItemsForFee, 'id', this.selectedData[i].id);
+ // if (lfind > -1 && this.selectedData[i].amount == 1) {
+ // this.asbItemsForFee[lfind].chargePrice = this.asbItemsForFee[lfind].chargePrice + totalPlan - totalCompute;
+ // this.selectedData[i].chargePrice = this.asbItemsForFee[lfind].chargePrice;
+ // break;
+ // }
+ //console.log('this.selectedData[i].amount', this.selectedData[i].amount)
+ if (this.selectedData[i].amount == 1) {
+ let chargePrice = this.selectedData[i].chargePrice
+ this.selectedData[i].chargePrice = Math.round((Number(chargePrice) + Number(totalPlan) - totalCompute)*100)/100 ;
+ this.selectedData[i].discount = Math.round(this.selectedData[i].chargePrice * 10000/this.selectedData[i].standardPrice)/100
+ //console.log('平衡金额 行数，前，后：', i, chargePrice, this.selectedData[i].chargePrice)
break;
}
}
@@ -1111,7 +1124,7 @@ export default {
this.$message.warning("收费方式合计收款不可小于应收金额！");
return;
}
-
+ let chargeMoney = 0
this.chargePays.forEach(e => {
if (e.chargeMoney) {
if (e.payModeId == '01') {
@@ -1128,9 +1141,12 @@ export default {
cardRegisterId: e.cardRegisterId,
});
}
+ chargeMoney += e.chargeMoney
}
});
+ let detailsTotal = 0
+
this.selectedData.forEach(e => {
asbitems.push({
asbitemId: e.asbitemId,
@@ -1138,8 +1154,15 @@ export default {
amount: e.amount,
registerAsbitemId: e.id,
});
+ detailsTotal += Math.round(100 * e.amount * e.chargePrice) / 100
});
+ if (Math.round(chargeMoney * 100) / 100 !== Math.round(detailsTotal * 100) / 100) {
+ this.$message.warning({ showClose: true, message: `明细合计 ${Math.round(detailsTotal * 100) / 100} 与 总金额 ${Math.round(chargeMoney * 100) / 100} 不一致` })
+ return
+ }
+
+
body = {
patientRegisterId: this.form.patientRegisterId,
invoiceNo: this.form.invoiceNo,
@@ -1178,7 +1201,7 @@ export default {
cancelButtonText: "否",
type: "warning",
}).then(() => {
- this.chargePrint('0007', false, res.data.chargeId)
+ this.chargePrint('0007', false, res.data.chargeId)
setTimeout(() => {
this.btnQuery();
}, 1000)
@@ -1582,7 +1605,7 @@ export default {
//immediate: true, // 立即执行
// // deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
- console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegisterNo)
+ console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegisterNo)
this.query.patientRegisterNo = this.patientRegisterNo
this.query.chargeFlag = 'N'
this.btnQuery()
条码号
-
档案号
-
姓名
-