diff --git a/public/pic/hisLog.jpg b/public/pic/hisLog.jpg index 28d29ab..bdeb5c5 100644 Binary files a/public/pic/hisLog.jpg and b/public/pic/hisLog.jpg differ diff --git a/public/pic/peisQrCode.jpg b/public/pic/peisQrCode.jpg index 9bbe88b..8975082 100644 Binary files a/public/pic/peisQrCode.jpg and b/public/pic/peisQrCode.jpg differ diff --git a/public/pic/peisQrCodeMini.jpg b/public/pic/peisQrCodeMini.jpg new file mode 100644 index 0000000..b903a08 Binary files /dev/null and b/public/pic/peisQrCodeMini.jpg differ diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index ce23305..0f68bb5 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -1402,14 +1402,14 @@ export default { }, // 根据体检单位ID，获取体检类别 - getMedicalTypeByOrg(customerOrgId){ + getMedicalTypeByOrg(customerOrgId) { return new Promise((resolve, reject) => { - postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId',{customerOrgId}) - .then(res => { - if(res.code > -1){ - this.form.medicalTypeId = res.data.medicalTypeId - } - }) + postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId }) + .then(res => { + if (res.code > -1) { + this.form.medicalTypeId = res.data.medicalTypeId + } + }) }) }, @@ -1494,7 +1494,7 @@ export default { // 如果是个人，则清除分组字典 if (customerOrgParentId == this.dict.personOrgId) { this.patientRegister.customerOrgGroup = [] - } + } if (this.form.customerOrgParentId == this.dict.personOrgId) { this.changeMedicalPackageId() @@ -1932,14 +1932,14 @@ export default { //提交 btnSubmit(formName, msgTip) { - console.log('btnSubmit,formName,form', formName, JSON.stringify(this.form)) + //console.log('btnSubmit,formName,form', formName, JSON.stringify(this.form)) this.$refs[formName].validate((valid, fields) => { // console.log('fields', fields) if (!valid) { this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message }); return false } - console.log('btnSubmit1', formName) + //console.log('btnSubmit1', formName) if (this.form.customerOrgId != this.dict.personOrgId) { if (!this.form.customerOrgRegisterId) { this.$message.warning({ showClose: true, message: "请填写单位体检次数！" }); @@ -1974,9 +1974,14 @@ export default { } else { delete body.id; } - console.log('btnSubmit3', formName) + //console.log('btnSubmit3', formName) // // console.log(`/api/patientregister/createreturninfo`, body); - postapi(`/api/PatientRegister/CreatePatientRegister`, body) + + // 保存前，判断是否有互斥项目 + this.checkAsbItemHC() + .then(() => { + return postapi(`/api/PatientRegister/CreatePatientRegister`, body) + }) .then(async (res) => { if (res.code > -1) { // 因为 res.data 返回的 isPatientOccupationalDisease 是错误的（因为职业病尚未保存，所以以form里的值为准） @@ -2035,10 +2040,36 @@ export default { } } ); - }); }, + // 检查项目互斥 + checkAsbItemHC() { + return new Promise((resolve, reject) => { + let asbitemIds = [] + //console.log('this.dataTransOpts.tableM.register_check_asbitem',this.dataTransOpts.tableM.register_check_asbitem) + this.dataTransOpts.tableM.register_check_asbitem.forEach(e => { + asbitemIds.push(e.asbitemId) + }); + + if (asbitemIds.length == 0) { + resolve() + } else { + postapi('/api/app/AsbitemMutualExclusion/GetAsbitemIsMutualExclusion', { asbitemIds }) + .then(res => { + if (res.code > -1) { + if(res?.data?.message) this.$message.warning({ showClose: true, message: res.data.message }) + } + }) + .finally(() => { + resolve() + }) + } + + }) + + }, + // 保存职业病信息 async occUpdate() { // 职业病基本信息 @@ -3312,9 +3343,9 @@ export default { //双击选套餐，并确认复制 rowDblclick(row) { this.packageRowClick(row) - .then(res => { - this.copyMedicalPackage() - }) + .then(res => { + this.copyMedicalPackage() + }) }, //复制套餐(确认选中套餐) diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 8f90e93..9bda25b 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -252,13 +252,15 @@ export default { Parameters: [ { Name: 'printer', Value: user }, { Name: 'LTS', Value: 'Y' }, //Y、N N只看不能打印 - { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, - { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, - { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, - { Name: "orgSign", Value: "pic/orgSign.png" }, - { Name: 'picExtOne', Value: 'pic/hisLog.jpg' }, + { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, //报告首页主图 + { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, //报告页眉图片 + { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, //报告页脚图片 + { Name: "orgSign", Value: "pic/orgSign.png" }, // 体检章 + { Name: 'picExtOne', Value: 'pic/hisLog.jpg' }, // 院徽 { Name: 'picExtTwo', Value: 'pic/orgSignCom.png' }, // 单位公章 - { Name: 'resultSign', Value: 'pic/resultSign.png' }, + { Name: 'resultSign', Value: 'pic/resultSign.png' }, // 结果章，如：职业病（本次体检未发现职业性异常） + { Name: 'picExtThree', Value: 'pic/peisQrCode.jpg' }, // 公众号二维码 + { Name: 'picExtFour', Value: 'pic/peisQrCodeMini.jpg' }, // 小程序二维码 ], IsHealthReport: 'Y' }; diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index c37f874..01ff841 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -23,6 +23,7 @@ +