diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue index 107d186..533d093 100644 --- a/src/components/360View/afterPart/index.vue +++ b/src/components/360View/afterPart/index.vue @@ -523,7 +523,6 @@ export default { } const { data: res } = await this.$http.post(url, params) if (res.code === 0) { - this.$message.success('保存成功') await this.getforeList() } else { this.$message.error(res.msg) diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue index e1dfe03..143df75 100644 --- a/src/components/360View/commonForm/deveopmentFIle.vue +++ b/src/components/360View/commonForm/deveopmentFIle.vue @@ -547,18 +547,22 @@ export default { type: '' }] this.tableData = this.originTableData + this.getPatientData() }, async getPatientData() { const { data: res } = await this.$http.get( - '/patient/view/getPatientData', - { - params: { - patientId: this.patientId - } + '/patient/view/getPatientData', + { + params: { + patientId: this.patientId } + } ) if (res.code === 0) { - this.dataForm = res.data + const data = res.data + this.headData[1].patientName = data.patientName + this.headData[1].sex = data.patientSex + this.headData[1].birthday = data.patientBirthday } else { this.$message.error(res.msg) } diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue index 0983ea8..58b5cd3 100644 --- a/src/components/360View/commonForm/eyesVision.vue +++ b/src/components/360View/commonForm/eyesVision.vue @@ -200,7 +200,7 @@
{{ item.name }}
- +

调节功能异常：

@@ -529,7 +529,7 @@ export default { created() { }, mounted() { - this.originTableData = JSON.parse(JSON.stringify(this.tableData)) + this.originTableData = JSON.parse(JSON.stringify(this.tableData)) this.getPatientData() }, methods: { @@ -540,24 +540,22 @@ export default { }, reSet() { this.dataForm = { - number: '', - name: '', - sex: '', - age: '', - file: '', - fileNUm: '' + patientId: '', + patientName: '', + patientSex: '', + patientAge: '' } this.tableData = this.originTableData this.getPatientData() }, async getPatientData() { const { data: res } = await this.$http.get( - '/patient/view/getPatientData', - { - params: { - patientId: this.patientId - } + '/patient/view/getPatientData', + { + params: { + patientId: this.patientId } + } ) if (res.code === 0) { this.dataForm = res.data diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue index edfa663..8d7717e 100644 --- a/src/components/360View/commonForm/optometryForm.vue +++ b/src/components/360View/commonForm/optometryForm.vue @@ -506,8 +506,6 @@ export default { mounted() { this.originTableData = JSON.parse(JSON.stringify(this.tableData)) this.getPatientData() - - console.log(window.localStorage.getItem('shili')) const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : [] if (shili.length) { this.tableData[0].od = shili[0].odVan @@ -519,24 +517,25 @@ export default { this.dataForm = this.formContent.a this.tableData = this.formContent.b this.getPatientData() - const shili = JSON.parse(window.localStorage.getItem('shili')) - if (shili.length) { - this.tableData[0].od = shili[0].odVan - this.tableData[0].os = shili[0].osVan - } }, reSet() { this.dataForm = { - number: '', - name: '', - sex: '', - age: '', + patientId: '', + patientName: '', + patientSex: '', + patientAge: '', file: '', fileNUm: '' } this.tableData = this.originTableData + this.getPatientData() }, async getPatientData() { + const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : [] + if (shili.length) { + this.tableData[0].od = shili[0].odVan + this.tableData[0].os = shili[0].osVan + } const { data: res } = await this.$http.get( '/patient/view/getPatientData', { @@ -546,7 +545,11 @@ export default { } ) if (res.code === 0) { - this.dataForm = res.data + const data = res.data + this.dataForm.patientId = data.patientId + this.dataForm.patientName = data.patientName + this.dataForm.patientSex = data.patientSex + this.dataForm.patientAge = data.patientAge } else { this.$message.error(res.msg) } diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue index a14edfd..e00ca89 100644 --- a/src/components/360View/dataInfo.vue +++ b/src/components/360View/dataInfo.vue @@ -131,7 +131,7 @@
- + @@ -124,6 +121,7 @@ export default { }, mounted() { + this.getPatientData() this.getSpecialItem() }, @@ -184,17 +182,32 @@ export default { this.$message.error(res.msg) } }, - // 提取数据 + // 点击行展示提取数据 handleData(item) { - console.log(187,item) this.examNo = item.examNo this.examineItem = item.examineItem this.getItemData() }, - // 查看报告 - handleRecord() { - this.isActive = true + handleRecord(item) { + console.log(item) + const patientInfo = { + examDate: item.examTime ? item.examTime.substring(0, 11) : '', + itemCode: item.examineItem, + examNo: item.examNo, + patientId: this.patientId + } + const { href } = this.$router.resolve({ + name: 'pacs', + query: { + info: this.$Base64.encode(JSON.stringify(patientInfo)) + } + }) + window.open(href, '_blank') }, + // 查看报告 + // handleRecord() { + // this.isActive = true + // }, // 关闭360弹框 closePacs() { this.isActive = false diff --git a/src/components/360View/specialExamine/index.vue b/src/components/360View/specialExamine/index.vue index ffb80ae..5356906 100644 --- a/src/components/360View/specialExamine/index.vue +++ b/src/components/360View/specialExamine/index.vue @@ -249,7 +249,6 @@ export default { } const { data: res } = await this.$http.post(url, params) if (res.code === 0) { - this.$message.success('保存成功') await this.getOutPatientList() } else { this.$message.error(res.msg) diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js index 4997c25..2a56a62 100644 --- a/src/page-subspecialty/router/index.js +++ b/src/page-subspecialty/router/index.js @@ -36,8 +36,14 @@ export const pageRoutes = [ meta: { title: '登录' } }, { - path: '/pacs', + path: '/pacsManage', component: () => import('@/page-subspecialty/views/pages/pacsManage/index'), + name: 'pacsManage', + meta: { title: 'pacs浏览器', isTab: true } + }, + { + path: '/pacs', + component: () => import('@/page-subspecialty/views/pages/pacs/index'), name: 'pacs', meta: { title: 'pacs浏览器', isTab: true } } diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue index 08c457a..f19e6ca 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue @@ -80,16 +80,16 @@ export default { this.tableText = '请查询所需数据' this.$refs.dataFormHis.resetFields() // 重置表单 this.tableData = [] - this.findHandle(1) }) }, // His查询按钮 async findHandle(flag) { this.loading = true - if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) { + if (!this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) { + this.loading = false return this.$message.error('搜索内容不能为空') } - const { data: res } = await this.$http.get('/pat/Manage/getHisPatientList', { + const { data: res } = await this.$http.get('/patient/getHisPatient', { params: this.dataFormHis }) if (res.code === 0) { diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue index 99665d5..340cee6 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue @@ -3,18 +3,15 @@ - - - - - - - - - - - diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue index 966800e..4c89d06 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue @@ -7,10 +7,10 @@ > - + - + @@ -38,9 +38,9 @@ 月 --> - - - + + +