diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index e5fc1c8..03fc161 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -10,14 +10,15 @@
-
+
| {{ details.asbitemNames }} |
- {{ '检查日期:' + details.checkDate.substring(0, 10) + ' 检查医生:' +
+ | {{ '检查日期:' + details.checkDate + ' 检查医生:' +
details.checkDoctorName
- }} |
+ }}
@@ -126,16 +127,18 @@ export default {
mergeSummarys(array, itemKey) {
let ret = ''
- array.forEach((e, i) => {
- //let splitStr = "
"
- if (i == 0) {
- ret = e[itemKey]
- } else if (i == 1) {
- ret = `1.${ret} ${Number(i) + 1}.${e[itemKey]}`
- } else {
- ret += ` ${Number(i) + 1}.${e[itemKey]}`
- }
- })
+ if (Array.isArray(array) && array.length > 0) {
+ array.forEach((e, i) => {
+ //let splitStr = "
"
+ if (i == 0) {
+ ret = e[itemKey]
+ } else if (i == 1) {
+ ret = `1.${ret} ${Number(i) + 1}.${e[itemKey]}`
+ } else {
+ ret += ` ${Number(i) + 1}.${e[itemKey]}`
+ }
+ })
+ }
return ret
},
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 8bb2c88..b03c452 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -6,7 +6,7 @@
:style="`position: absolute; top: 0px; left: ${Math.floor((window.pageWidth - 120) / 2) - 110}px; display: flex;z-index: 3;`">
新增综述
+ :disabled="sumBtnDisabledAddSummary">新增综述
@@ -24,13 +24,13 @@
+ :disabled="sumBtnDisabledAddSummary">
+ :disabled="sumBtnDisabledAddSummary">
+ style="margin-left: 2px;min-width:21px;height:21px;padding:2px;background-color: red;" @click="delSumHead(scope.$index)"
+ :disabled="sumBtnDisabledAddSummary">
@@ -43,13 +43,13 @@
+ :disabled="sumBtnDisabledAddSummary">
@@ -63,13 +63,13 @@
{{
+ :disabled="sumBtnDisabledCollapse">{{
collapse ?
'展开' : '折叠' }}全部建议
新增建议
+ :disabled="sumBtnDisabled">新增建议
@@ -93,32 +93,32 @@
+ :id="scope.row.id" :disabled="sumBtnDisabled">
- -->
+
+
+
+
+
+ :disabled="sumBtnDisabledCollapse">
+ style="margin-left: 2px;min-width:21px;height:21px;padding:2px;background-color:red;" @click="delSugHead(scope.$index)"
+ :disabled="sumBtnDisabled">
-
+
诊断
-
-
-
-
-
-
-
+
医学解释
-
-
-
-
+
+
+
@@ -146,7 +145,7 @@
+ :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
@@ -154,9 +153,9 @@
+ :disabled="sumBtnDisabled" size="small">
@@ -167,7 +166,7 @@
+ :disabled="sumBtnDisabled">
+ :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
@@ -191,8 +190,8 @@
@@ -204,7 +203,7 @@
+ :disabled="sumBtnDisabled">
+ :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
@@ -228,8 +227,8 @@
@@ -329,7 +328,8 @@ export default {
collapse: false, // 折叠/展开全部建议
- dispTermReason: 'N', // 显示医学解释与常见原因
+ dispTermReason: 'Y', // 显示医学解释与常见原因
+ dispDiagnsis:'Y', // 显示诊断
dialogWinSymbols: false,
selection: { // 光标位置
@@ -361,19 +361,35 @@ export default {
if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
// 获取是否显示医学解释与常见原因
- // 获取系统参数(医生诊台侧边项目归类模式 0-检检类别,1-指引类别,2-报告类别)
+ // 获取系统参数(获取是否显示医学解释与常见原因)
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'summary_check_disp_reas' })
.then(res => {
if (res.code > -1) {
this.dispTermReason = res.data || "Y"
}
})
+
+ // 获取系统参数(获取是否显示诊断)
+ postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'summary_check_disp_diagnsis' })
+ .then(res => {
+ if (res.code > -1) {
+ this.dispDiagnsis = res.data || "Y"
+ }
+ })
+
this.AI.height = this.frameHeight
},
//挂载完成
async mounted() {
+ // 监听来自 Electron 的调用
+ if (this.$peisAPI) {
+ this.$peisAPI.onContextMenuAction((data) => {
+ this.onContextMenuDIY(data)
+ });
+ }
+
// this.rowDrop(); (综述取消拖拽)
this.rowDropSuggestion();
@@ -405,7 +421,52 @@ export default {
// AIdiagnosisHeight
AIDH() {
return Math.floor((this.AI.height - 24 - 42 - 4) / 21.5)
- }
+ },
+
+ sumBtnDisabled(){
+ let patientRegister = this.dataTransOpts.tableS.patient_register
+ let ret = true
+
+ //' 请选择体检人员'
+ if (!patientRegister.id) return ret
+ // '人员已锁定,不可执行此操作'
+ if (patientRegister?.isLock == 'Y') return ret
+
+ // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)
+ if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
+
+ return ret
+ },
+
+ sumBtnDisabledAddSummary(){
+ let patientRegister = this.dataTransOpts.tableS.patient_register
+ let ret = true
+
+ //' 请选择体检人员'
+ if (!patientRegister.id) return ret
+ // '人员已锁定,不可执行此操作'
+ if (patientRegister?.isLock == 'Y') return ret
+
+ if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
+ return false;
+ } else {
+ return true;
+ }
+
+ },
+
+ sumBtnDisabledCollapse(){
+ let patientRegister = this.dataTransOpts.tableS.patient_register
+ let ret = true
+
+ //' 请选择体检人员'
+ if (!patientRegister.id) return ret
+ // '人员已锁定,不可执行此操作'
+ if (patientRegister?.isLock == 'Y') return ret
+
+ return false
+
+ },
},
methods: {
@@ -417,6 +478,12 @@ export default {
// e.style.height = 'auto'; // 重置高度
// });
// },
+
+ // 自定义右击事件
+ onContextMenuDIY(data){
+ this.$message({showClose:true,message:data})
+ },
+
// 获取诊断数据
async dictInit() {
@@ -470,6 +537,7 @@ export default {
let pojo = {
id,
patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+ suggestionTitle: '',
diagnosisIds: [],
medicalInterpretations: [
{
@@ -744,37 +812,7 @@ export default {
}
});
},
-
- // 按钮可用
- sumBtnDisabled(btnType) {
- let patientRegister = this.dataTransOpts.tableS.patient_register
- let ret = true
-
- //' 请选择体检人员'
- if (!patientRegister.id) return ret
- // '人员已锁定,不可执行此操作'
- if (patientRegister.isLock && patientRegister.isLock == 'Y') return ret
-
- // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)
-
- switch (btnType) {
- case 'collapse':
- return false;
- case 'addSummary':
- if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
- return false;
- } else {
- return true;
- }
- default:
- break;
- }
-
- if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
-
- return ret
- },
-
+
// 诊断选择
changeDiagnosis(v) {
// console.log('changeDiagnosis', v)
@@ -1197,8 +1235,11 @@ export default {
return
}
- console.log('this.$peisAPI.contextMenuForPeis()')
- this.$peisAPI.contextMenuForPeis()
+ let menus = [
+ { label: '测试菜单', itemId: '测试菜单', enabled: true }
+ ]
+
+ this.$peisAPI.showContextMenu(menus)
.then(res => {
console.log('res', res)
})
@@ -1209,6 +1250,18 @@ export default {
console.log('finally')
})
+ // console.log('this.$peisAPI.contextMenuForPeis()')
+ // this.$peisAPI.contextMenuForPeis()
+ // .then(res => {
+ // console.log('res', res)
+ // })
+ // .catch(err => {
+ // console.log('err', err)
+ // })
+ // .finally(() => {
+ // console.log('finally')
+ // })
+
/*
let items = [
{