From 595b03b7c88e6dc5529dd7d50e1a3c3bbc33b886 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 2 May 2024 15:09:06 +0800 Subject: [PATCH] doctor --- src/components/doctorCheck/CheckItemList.vue | 6 +-- .../doctorCheck/CheckPictureUpload.vue | 13 +++-- .../doctorCheck/PatientRegisterList.vue | 2 +- .../doctorCheck/RegisterCheckList.vue | 2 +- .../patientRegister/AsbChargeRequest.vue | 50 +++++++++++++------ .../patientRegister/PatientRegisterItem.vue | 2 +- .../patientRegisterAsbItem.vue | 33 ++++++++++-- .../customerReport/combinationDetails.vue | 2 +- src/views/customerReport/detailedIitems.vue | 2 +- .../customerReport/diseaseStatistics.vue | 2 +- .../customerReport/personnelPositive.vue | 2 +- .../customerReport/positiveResultsList.vue | 2 +- src/views/customerReport/unitSettlement.vue | 2 +- .../doctorCheck/unitphysicalexamination.vue | 2 +- src/views/report/chargeAsbitem.vue | 2 +- src/views/report/checkStatus.vue | 2 +- src/views/report/unCheckAsbitem.vue | 2 +- 17 files changed, 90 insertions(+), 38 deletions(-) diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 80d4ffd..618d35c 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -34,16 +34,14 @@
- - {{ item.result }} - + {{ item.result }}
特殊符号：
- + {{ item.displayName }}
diff --git a/src/components/doctorCheck/CheckPictureUpload.vue b/src/components/doctorCheck/CheckPictureUpload.vue index 3a99de2..ddd1d14 100644 --- a/src/components/doctorCheck/CheckPictureUpload.vue +++ b/src/components/doctorCheck/CheckPictureUpload.vue @@ -92,7 +92,7 @@ export default { btnUpload() { console.log('that.registerCheckId', this.registerCheckId) if (!(this.fileList && typeof this.fileList == 'object' && this.fileList.length > 0)) { - this.$message.warning({ showClose: true, message: "请选择要上传的文件！"}) + this.$message.warning({ showClose: true, message: "请选择要上传的文件！" }) return } let checkSize = [] @@ -101,7 +101,7 @@ export default { }); if (checkSize.length > 0) { - this.$message.error({ showClose: true, message: `所选文件 ${JSON.stringify(checkSize)} 大于 20MB ，文件过大无法上传`}) + this.$message.error({ showClose: true, message: `所选文件 ${JSON.stringify(checkSize)} 大于 20MB ，文件过大无法上传` }) return; } @@ -111,15 +111,22 @@ export default { for (let i = 0; i < this.fileList.length; i++) { if (err) break; let file = this.fileList[i] + console.log('file',file) let reader = new FileReader(); let that = this; // 定义读取文件 reader.onload = (event) => { + let fileName = "" + let dotIndex = file.name.lastIndexOf('.'); + if(dotIndex>-1) fileName = file.name.substring(0, dotIndex); let data = event.target.result; console.log('base64', data.length, data) let body = { registerCheckId: that.registerCheckId, - pictureBaseStrs: [data] + pictureBaseStrs: [{ + fileName, + pictureBaseStr: data + }] } postapi('/api/app/registercheckpicture/uploadregistercheckpicturemany', body) .then(res => { diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index b269b3d..b450d08 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -172,7 +172,7 @@ + width="880px" height="600px"> diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue index b0c16ce..8a3b6ab 100644 --- a/src/components/doctorCheck/RegisterCheckList.vue +++ b/src/components/doctorCheck/RegisterCheckList.vue @@ -102,7 +102,7 @@ export default { return } console.log(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`) - getapi(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`) + postapi('/api/app/RegisterCheck/GetRegisterCheckWithAsbitems', { patientRegisterId }) .then((res) => { console.log("registerCheckList", res.data); if (res.code != -1) { diff --git a/src/components/patientRegister/AsbChargeRequest.vue b/src/components/patientRegister/AsbChargeRequest.vue index 8383711..370708c 100644 --- a/src/components/patientRegister/AsbChargeRequest.vue +++ b/src/components/patientRegister/AsbChargeRequest.vue @@ -16,15 +16,15 @@ - + @@ -33,18 +33,20 @@
申请单包含项目
- + @@ -125,28 +127,46 @@ export default { }) }, + setChargeRequestFlag(chargeRequestFlag) { + let ret = '未收费' + switch (chargeRequestFlag) { + case '1': + ret = '已收费' + break; + case '2': + ret = '已作废' + break; + case '3': + ret = '已撤消' + break; + default: + break; + } + return ret + }, + handleSelectionChange(v) { this.selectedData = v; }, - setBtnDisabled(row,oprType){ + setBtnDisabled(row, oprType) { let ret = true - if(oprType == 'chargeBack'){ - - }else{ - + if (oprType == 'chargeBack') { + if(row.chargeRequestFlag == '1') ret = false + } else { + if(row.chargeRequestFlag == '0') ret = false } - + return ret }, // 获取申请单明细 - rowClick(row){ + rowClick(row) { this.hisRequestDataDetails = [] postapi('/api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeQuestId', { chargeRequestId: row.id }) .then(res => { if (res.code > -1) { res.data.forEach(e => { - e.total = Number(e.chargePrice*e.amount) + e.total = Number(e.chargePrice * e.amount) this.hisRequestDataDetails.push(e) }); } diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 07d1d65..694cbd4 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -1133,7 +1133,7 @@ export default { // 通过组合项目，获取包含明细 getAsbItems(asbId) { let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId }) - console.log(asbId,asbItems) + // console.log(asbId,asbItems) let ret = [] asbItems.forEach(e => { ret.push(' ' + e.itemName) diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue index facb5da..640d469 100644 --- a/src/components/patientRegister/patientRegisterAsbItem.vue +++ b/src/components/patientRegister/patientRegisterAsbItem.vue @@ -6,6 +6,10 @@