From d0476b22827eea25f69bed3360d575470f34826f Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 4 Jul 2024 17:40:22 +0800 Subject: [PATCH] occ --- public/sysConfig.json | 2 +- src/components/occDisease/PoisonAsbitem.vue | 867 ++++++++++++++++++ .../patientRegister/PatientRegisterEdit.vue | 82 +- .../patientRegister/PatientRegisterItem.vue | 2 +- .../patientRegister/PatientRegisterList.vue | 5 +- src/components/report/TurnoverReport.vue | 266 ++++++ src/router/index.js | 8 +- src/views/basic-dictionary/ToxicFactors.vue | 435 ++++----- 8 files changed, 1402 insertions(+), 265 deletions(-) create mode 100644 src/components/occDisease/PoisonAsbitem.vue create mode 100644 src/components/report/TurnoverReport.vue diff --git a/public/sysConfig.json b/public/sysConfig.json index 3f20f28..d005ca8 100644 --- a/public/sysConfig.json +++ b/public/sysConfig.json @@ -1,4 +1,4 @@ { - "apiurl": "http://10.1.12.140:9529", + "apiurl": "http://140.143.162.39:9529", "softName":"创业体检管理系统" } \ No newline at end of file diff --git a/src/components/occDisease/PoisonAsbitem.vue b/src/components/occDisease/PoisonAsbitem.vue new file mode 100644 index 0000000..c1524ad --- /dev/null +++ b/src/components/occDisease/PoisonAsbitem.vue @@ -0,0 +1,867 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 26175ca..28f75c3 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -21,7 +21,7 @@
个人预约
-
+
同步团检预约
@@ -389,7 +389,7 @@ - + @@ -404,7 +404,7 @@ { // console.log('fields', fields) if (!valid) { @@ -1903,14 +1903,14 @@ export default { .then(res => { if (res.code > -1 && res.data && Array.isArray(res.data) && res.data.length > 0) { this.thirdInterfaceId = res.data[0].id - return postapi('/api/app/AppointPatientRegister/GetByPatientRegisterId', { thirdInterfaceId:this.thirdInterfaceId, appointPatientRegisterId:'1',patientRegisterId: this.form.id }) + return postapi('/api/app/AppointPatientRegister/GetByPatientRegisterId', { thirdInterfaceId: this.thirdInterfaceId, appointPatientRegisterId: '1', patientRegisterId: this.form.id }) } }) .then(res => { if (res && res.code > -1) { this.form.appointPatientRegisterId = res.data.appointPatientRegisterId return postapi('/api/app/AppointPatientRegister/GetAppointRegisterAsbitemListById', { - thirdInterFaceId:this.thirdInterfaceId, + thirdInterFaceId: this.thirdInterfaceId, appointPatientRegisterId: res.data.appointPatientRegisterId }) } @@ -2447,6 +2447,70 @@ export default { this.dialogWin.OccDisease = true }, + // 获取接害因素 + 检查类别 的组合项目 后,刷新当前组合项目 + changeOccPosionOrCheckType() { + this.getOccAsbitems().then(res => { + for (let i = this.dataTransOpts.tableM.register_check_asbitem.length - 1; i >= 0; i--) { + let e = this.dataTransOpts.tableM.register_check_asbitem[i]; + if (e.isCharge == 'Y' || e.checkCompleteFlag != '0') { + continue + } else { + this.dataTransOpts.tableM.register_check_asbitem.splice(i, 1) + } + } + let lfind = 0 + let payTypeFlag = '1'; //职业病 默认单位支付 + if (this.form.customerOrgId == this.dict.personOrgId) payTypeFlag = '0' //个人支付 + this.occAsbitems.forEach(e => { + lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.id) + if (lfind == -1) { + this.dataTransOpts.tableM.register_check_asbitem.push({ + asbitemId: e.id, + asbitemName: e.displayName, + patientRegisterId: this.form.id, + standardPrice: e.price, + chargePrice: e.ocCheckTypeDetailPrice, + payTypeFlag, + isCharge: "N", + checkCompleteFlag: '0', + discount: e.price == 0 ? 100 : Math.floor(10000 * e.ocCheckTypeDetailPrice / e.price) / 100, + amount: e.ocCheckTypeDetailAmount, + total: e.ocCheckTypeDetailAmount * e.ocCheckTypeDetailPrice, + standTotal: e.ocCheckTypeDetailAmount * e.price + }) + } + }); + + }) + }, + + // 获取接害因素 + 检查类别 的组合项目 + getOccAsbitems() { + return new Promise((resolve, reject) => { + if (!this.form.ocCheckTypeId || this.form.poisonIds.length == 0) { + this.occAsbitems = [] + resolve(this.occAsbitems) + } else { + let body = { + ocCheckTypeId: this.form.ocCheckTypeId, + poisonIds: this.form.poisonIds + } + postapi('/api/app/OcCheckTypeDetail/GetOcCheckTypeDetailByOcCheckTypeIdAndPoisonId', body).then(res => { + if (res.code > -1) { + this.occAsbitems = res.data + resolve(this.occAsbitems) + } else { + reject(res.message) + } + }) + .catch(err => { + reject(err) + }) + } + }) + }, + + // 显示预约 btnWebBooking() { @@ -2477,7 +2541,7 @@ export default { this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId this.form.customerOrgId = [this.dict.personOrgId] //单位编号 默认个人 this.form.customerOrgParentId = this.dict.personOrgId - this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001" //默认单位体检次数 + this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001" //默认单位体检次数 await this.initFormData(this.dataTransOpts.tableS.patient_register.id) // "appointPatientRegisterId": "string", @@ -2512,7 +2576,7 @@ export default { } ) - console.log('this.form',JSON.stringify(this.form)) + console.log('this.form', JSON.stringify(this.form)) // 明细必填项 // "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6", // "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index a3de0dd..a5eef85 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -132,7 +132,7 @@ - +