diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 22a2eba..e91bf4d 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -159,9 +159,9 @@ export default { }) //获取结果状态提示数据 - getapi('/api/app/common-char/in-filter').then(res => { + postapi('/api/app/CommonChar/GetCommonCharList',{}).then(res => { if(res.code >= 0){ - this.symbols = res.data.items + this.symbols = res.data } }) }, @@ -284,6 +284,8 @@ export default { //项目列为计算函数 computeFun(index) { + // 有计算项的,才调用计算函数 + let haveComputeFun = false let checkItem = this.doctorCheck.checkItemList[index] console.log('checkItem', checkItem) let body = { @@ -296,7 +298,9 @@ export default { itemId: e.itemId, result: e.result }) + if(e.isCalculationItem == 'Y') haveComputeFun = true }); + if(!haveComputeFun) return // 有计算项的,才调用计算函数 let lfind = -1 postapi('/api/app/diagnosisfunction/getcalculationfunctionresult', body).then(res => { if (res.code != -1) { diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index 4d94e7f..a8d71dd 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -8,10 +8,10 @@ style="font-size: 24px;color: red;cursor:pointer;"> -
- - +
+ +
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue index 59f974d..29b85bd 100644 --- a/src/components/report/CusOrgOCX.vue +++ b/src/components/report/CusOrgOCX.vue @@ -1,6 +1,6 @@