diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 7e6c0ca..19a0571 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -566,15 +566,7 @@ export default { { Name: "peisReportPageFooter", Value: "pic/peisReportPageFooter.jpg" } ], }; - - // postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.doctorCheck.prBase.id}`) - // .then((res) => { - // if (res.code > -1) { - // toOutShell.ReportTable = res.data; - // console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell)); - // return this.$peisAPI.printPre(JSON.stringify(toOutShell)); - // } - // }) + toOutShell.BusinessCode = this.doctorCheck.prBase.id this.$peisAPI.printPre(JSON.stringify(toOutShell)) .then(res => { diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index f956e19..75bffb2 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -108,7 +108,7 @@ export default { start: 0, end: 0 }, symbols: [], //特殊符号 - + userId:'', }; }, @@ -119,6 +119,8 @@ export default { //挂载完成 mounted() { this.checkItemList(this.dataTransOpts.tableS.register_check.id); + + this.userId = window.sessionStorage.getItem("userId") }, computed: { @@ -427,6 +429,10 @@ export default { .then(res => { if (res.code > -1) { this.doctorCheck.RegisterCheckEdit = res.data + if(this.doctorCheck.RegisterCheckEdit.completeFlag == '0'){ + this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId + this.doctorCheck.RegisterCheckEdit.checkDate = new Date() + } return getapi(`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`) } }) diff --git a/src/components/doctorCheck/CheckPictureUpload.vue b/src/components/doctorCheck/CheckPictureUpload.vue index ddd1d14..a389efa 100644 --- a/src/components/doctorCheck/CheckPictureUpload.vue +++ b/src/components/doctorCheck/CheckPictureUpload.vue @@ -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: `所选文件大于 20MB ,文件过大无法上传` }) return; } diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 80658cb..26d59da 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -141,6 +141,7 @@ export default { }, prBaseInit: {}, PatientRegisterList: [], // 参数 + userId: '', }; }, @@ -153,6 +154,8 @@ export default { // 回车替代查询 this.enterToQuery() + this.userId = window.sessionStorage.getItem("userId") + //获取体检登记信息 (检查医生诊台 与 总检医生诊台 切换时用到) this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo) }, @@ -186,7 +189,7 @@ export default { // 根据pacs条码查询 onQueryByPacsNo(checkRequestNo) { - postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', {checkRequestNo}).then(res => { + postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => { if (res.code > 0) { this.prBase.patientRegisterNo = res.data.patientRegisterNo this.onQueryByPatientRegisterNo() @@ -196,7 +199,7 @@ export default { // 根据lis条码查询 onQueryByLisNo(lisRequestNo) { - postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', {lisRequestNo}).then(res => { + postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', { lisRequestNo }).then(res => { if (res.code > 0) { this.prBase.patientRegisterNo = res.data.patientRegisterNo this.onQueryByPatientRegisterNo() @@ -207,7 +210,7 @@ export default { //按条码号查个人数据 onQueryByPatientRegisterNo() { let patientRegisterNo = this.prBase.patientRegisterNo - if(!patientRegisterNo) return + if (!patientRegisterNo) return let body = { // sType: 1, patientRegisterNo, @@ -219,6 +222,10 @@ export default { .then((res) => { if (res.code > -1) { this.dataTransOpts.tableS.patient_register = res.data + if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId + if (this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N') { + this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId + } // console.log('res.data',res.data) // console.log('this.dataTransOpts.tableS.patient_register',this.dataTransOpts.tableS.patient_register) } @@ -241,6 +248,10 @@ export default { .then((res) => { if (res.code > -1) { this.dataTransOpts.tableS.patient_register = res.data + if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId + if (this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N') { + this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId + } } }) .finally(() => { @@ -262,8 +273,10 @@ export default { if (res.code > -1) { if (res.data.items.length == 1) { this.dataTransOpts.tableS.patient_register = res.data.items[0] - // this.dataTransOpts.tableS.patient_register.id = res.data.items[0].id - // this.dataTransOpts.tableS.patient_register.patientRegisterNo = res.data.items[0].patientRegisterNo + if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId + if (this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N') { + this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId + } this.dataTransOpts.refresh.patient_register.S++ // this.getPatientRegister(res.data.items[0].id) @@ -296,6 +309,10 @@ export default { .then((res) => { if (res.code > -1) { this.dataTransOpts.tableS.patient_register = res.data + if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId + if(this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N'){ + this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId + } } }) .finally(() => { diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue index 1478024..935a0ce 100644 --- a/src/components/doctorCheck/RegisterCheckList.vue +++ b/src/components/doctorCheck/RegisterCheckList.vue @@ -147,6 +147,7 @@ export default { if (res.data.length > 0) { this.doctorCheck.RegisterCheckId = res.data[0].id this.dataTransOpts.tableS.register_check.id = res.data[0].id + // this.doctorCheck.RegisterCheckEdit = res.data[0] // this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0]) diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 9a3499c..e5ae435 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -1236,6 +1236,7 @@ export default { let toOutShell = { ReportCode, token, + IsMoreLabel: 'Y', isBuildImage: 'N', IsUploadPdf: 'N', preViewCanPrint: "N", diff --git a/src/components/sumDoctorCheck/SumPREdit.vue b/src/components/sumDoctorCheck/SumPREdit.vue index 9a502df..f9730cd 100644 --- a/src/components/sumDoctorCheck/SumPREdit.vue +++ b/src/components/sumDoctorCheck/SumPREdit.vue @@ -32,9 +32,9 @@
审核医生 - - +