diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue index caad823..47c40b5 100644 --- a/src/components/360View/commonForm/optometryForm.vue +++ b/src/components/360View/commonForm/optometryForm.vue @@ -604,7 +604,7 @@ export default { const userData = JSON.parse(window.sessionStorage.getItem('qg-userData')) const date = this.$moment().format('YYYY-MM-DD') const mzName = window.sessionStorage.getItem('mzDoctorName') - this.dataForm.tongk = '正常瞳孔' + // this.dataForm.tongk = '正常瞳孔' this.dataForm.jianchaFangfa = '综合' this.dataForm.ygsSign = userData.signImgBase this.dataForm.ysSign = mzName @@ -833,6 +833,7 @@ export default { this.handleSaveTable() }, handleSaveTable() { + if (!this.dataForm.tongk) return this.$message.warning('请选择瞳孔状态!') this.dataForm.pjyjCheck = this.handleCheck(this.suggest) this.dataForm.zzcfCheck = this.handleCheck(this.remoteUse) this.$http.post('/ygbgd/saveYgbgd', this.dataForm).then(({ data: res }) => { diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue index 3fb4530..efb7da6 100644 --- a/src/components/360View/index.vue +++ b/src/components/360View/index.vue @@ -425,8 +425,8 @@ export default { // 360浏览器 handlePacs() { // const baseUrl = 'http://z1.huimucloud.com:8085' - // const baseUrl = 'http://10.80.5.32:8026' - const baseUrl = 'http://192.168.0.85:8001' + const baseUrl = 'http://10.80.5.32:8026' + // const baseUrl = 'http://192.168.0.85:8001' const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=` window.open(href, '_blank') // const { href } = this.$router.resolve({ diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue index 10bf446..64d4662 100644 --- a/src/components/360View/special/index.vue +++ b/src/components/360View/special/index.vue @@ -217,8 +217,8 @@ export default { // } // }) // const baseUrl = 'http://z1.huimucloud.com:8085' - // const baseUrl = 'http://10.80.5.32:8026' - const baseUrl = 'http://192.168.0.85:8001' + const baseUrl = 'http://10.80.5.32:8026' + // const baseUrl = 'http://192.168.0.85:8001' const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=` window.open(href, '_blank') }, diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js index f17b186..ab53cbd 100644 --- a/src/page-subspecialty/router/index.js +++ b/src/page-subspecialty/router/index.js @@ -238,7 +238,7 @@ function loginByDocId(doctorId, next, to) { } http.post('/loginByDid', params).then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return Vue.prototype.$message.error(res.msg) } window.sessionStorage.setItem('xa-token', res.data.token) window.sessionStorage.setItem('qg-userData', JSON.stringify(res.data.currentUser)) @@ -251,11 +251,13 @@ function loginByDocId(doctorId, next, to) { } function loginByUserId(userIdNumber, next, to) { const params = { - userIdNumber: userIdNumber.slice(2) + userIdNumber: userIdNumber } http.post('/loginByPidNum', params).then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg) + console.log(123) + Vue.prototype.$message.error(res.msg) + return next({ name: 'login' }) } window.sessionStorage.setItem('xa-token', res.data.token) window.sessionStorage.setItem('qg-userData', JSON.stringify(res.data.currentUser)) diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue index 9984615..1e88eca 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue @@ -667,11 +667,20 @@ export default { headTemplate }, props: { + id: { + type: String, + default: '' + }, patientId: { type: String, default: '' } }, + watch: { + id(val) { + this.queryFirstVisit() + } + }, data() { return { options1: [ @@ -838,34 +847,33 @@ export default { methods: { async queryFirstVisit() { const params = { - patientId: this.patientId + id: this.id } - const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosis', { + const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosisById', { params: params }) if (res.code === 0) { this.formData = res.data - if (!this.formData.id) { - await this.queryFirstInfo() + if (this.formData.isChange === 0) { await this.getPatientData() } } else { this.$message.error(res.msg) } }, - async queryFirstInfo() { - const params = { - patientId: this.patientId - } - const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosisInfos', { - params: params - }) - if (res.code === 0) { - this.formData = res.data - } else { - this.$message.error(res.msg) - } - }, + // async queryFirstInfo() { + // const params = { + // patientId: this.patientId + // } + // const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosisInfos', { + // params: params + // }) + // if (res.code === 0) { + // this.formData = res.data + // } else { + // this.$message.error(res.msg) + // } + // }, // 获取患者信息 async getPatientData() { const { data: res } = await this.$http.get( diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/firstForm.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/firstForm.vue new file mode 100644 index 0000000..3034a8a --- /dev/null +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/firstForm.vue @@ -0,0 +1,209 @@ + + + diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue index 8eb0051..46b89ff 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue @@ -25,7 +25,8 @@ - + + @@ -54,6 +55,7 @@