diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 29be009..75ccb3c 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -81,6 +81,16 @@
@handleSaveTable="updateForm"
@formDelete="formDelete"
/>
+
@@ -95,8 +105,10 @@ import MraForm from '@/page-subspecialty/views/modules/formList/mraForm.vue'
import LaserSurgery from '@/page-subspecialty/views/modules/formList/laserSurgery.vue'
import ReportForm from '@/page-subspecialty/views/modules/formList/reportForm.vue'
import MraOrder from '@/page-subspecialty/views/modules/formList/mraOrder.vue'
+import MinorOperation from '@/page-subspecialty/views/modules/formList/MinorOperation.vue'
export default {
components: {
+ MinorOperation,
MraOrder,
callMedical,
ReportForm,
diff --git a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
index dda43a0..27e3f1a 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
@@ -59,7 +59,7 @@ export default {
},
{
type: '同意书',
- list: ['睑板腺按摩']
+ list: ['门诊小手术同意书']
},
{
type: '其他',
diff --git a/src/page-subspecialty/store/modules/sign.js b/src/page-subspecialty/store/modules/sign.js
index af20ce2..f348d53 100644
--- a/src/page-subspecialty/store/modules/sign.js
+++ b/src/page-subspecialty/store/modules/sign.js
@@ -30,7 +30,9 @@ export default {
fundusDocSign: '',
kinSign: '',
performerSign: '',
- checkerSign: ''
+ checkerSign: '',
+ minorPatientSign: '',
+ minorKinSign: ''
},
getters: {
doctorSignImg: state => state.doctorSignImg,
@@ -46,10 +48,12 @@ export default {
informedDocSign: state => state.informedDocSign,
informPatientSign: state => state.informPatientSign,
checkSign: state => state.checkSign,
- fundusDocSign: state => state.fundusDocSign,
+ fundusDocSign: state => state.fundusDocSign,
kinSign: state => state.kinSign,
performerSign: state => state.performerSign,
- checkerSign: state => state.checkerSign
+ checkerSign: state => state.checkerSign,
+ minorPatientSign: state => state.minorPatientSign,
+ minorKinSign: state => state.minorKinSign
},
mutations: {
// 销毁签字笔
@@ -192,7 +196,7 @@ export default {
this.commit('informedDocSign', img_base64)
} else if (state.type === 11) {
this.commit('informPatientSign', img_base64)
- } else if (state.type === 12) {
+ } else if (state.type === 12) {
this.commit('fundusDocSign', img_base64)
} else if (state.type === 13) {
this.commit('kinSign', img_base64)
@@ -202,6 +206,10 @@ export default {
this.commit('checkerSign', img_base64)
} else if (state.type === 16) {
this.commit('checkSign', img_base64)
+ } else if (state.type === 17) {
+ this.commit('minorPatientSign', img_base64)
+ } else if (state.type === 18) {
+ this.commit('minorKinSign', img_base64)
}
} else {
// debugPrint("saveSignToBase64 error,description:" + args[0]);
@@ -259,6 +267,12 @@ export default {
},
checkerSign(state, val) {
state.checkerSign = val
+ },
+ minorPatientSign(state, val) {
+ state.minorPatientSign = val
+ },
+ minorKinSign(state, val) {
+ state.minorKinSign = val
}
}
}
diff --git a/src/page-subspecialty/views/modules/formList/MinorOperation.vue b/src/page-subspecialty/views/modules/formList/MinorOperation.vue
new file mode 100644
index 0000000..133a9b6
--- /dev/null
+++ b/src/page-subspecialty/views/modules/formList/MinorOperation.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue
index b591fdf..5902a3b 100644
--- a/src/page-subspecialty/views/modules/formList/reportForm.vue
+++ b/src/page-subspecialty/views/modules/formList/reportForm.vue
@@ -143,9 +143,6 @@ export default {
},
created() {
this.origin = JSON.parse(JSON.stringify(this.formData))
- this.confirmData.patientName = this.patientDetail.patientName
- const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
- this.confirmData.operator = userData.signImgBase
this.getReportInfo()
},
methods: {
@@ -210,6 +207,11 @@ export default {
this.handleResValue(res.fmwOs, this.formData.form.OS)
this.confirmData.remark = res.remark
this.confirmData.operator = res.operator
+ if (!res.jzNumber) {
+ this.confirmData.patientName = this.patientDetail.patientName
+ const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
+ this.confirmData.operator = userData.signImgBase
+ }
})
},
// 获取项目id列表