diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 50d8cee..7fcb4c3 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -267,13 +267,13 @@ export default { if (checkItem.referenceRangeValue) { let criticalRangeValue = checkItem.criticalRangeValue - let valueArr = checkItem.referenceRangeValue.split('-') + let valueArr = checkItem.referenceRangeValue.replaceAll('--','-').replaceAll('〜','-').replaceAll('～','-').split('-') if (valueArr.length == 1) valueArr.unshift(0) // console.log('valueArr',checkItem.referenceRangeValue,valueArr) if (criticalRangeValue) { - let criticalArr = criticalRangeValue.split('-') + let criticalArr = criticalRangeValue.replaceAll('--','-').replaceAll('〜','-').replaceAll('～','-').split('-') if (criticalArr.length == 1) criticalArr.unshift(0) // console.log('criticalArr',checkItem.criticalRangeValue,criticalArr) @@ -299,7 +299,7 @@ export default { //错误值校验 let errArr = [] if (checkItem.inputCheck) { - errArr = checkItem.inputCheck.split('-') + errArr = checkItem.inputCheck.replaceAll('--','-').replaceAll('〜','-').replaceAll('～','-').split('-') if (errArr.length == 1) errArr.unshift(-1) } if (errArr && errArr.length > 1) { diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue index a9556c5..6506518 100644 --- a/src/components/doctorCheck/CheckSumSug.vue +++ b/src/components/doctorCheck/CheckSumSug.vue @@ -41,22 +41,23 @@ :disabled="doctorBtnDisabled('addSummary')">新增小结
- 保存结果 + 保存结果
审核
- 排队 + 排队
- 危急值 + 危急值
- +
@@ -96,6 +97,13 @@
+
+ + + + +
+ diff --git a/src/components/follow/FollowPlan.vue b/src/components/follow/FollowPlan.vue new file mode 100644 index 0000000..0071875 --- /dev/null +++ b/src/components/follow/FollowPlan.vue @@ -0,0 +1,237 @@ + + + diff --git a/src/components/follow/FollowQuery.vue b/src/components/follow/FollowQuery.vue new file mode 100644 index 0000000..ea269e4 --- /dev/null +++ b/src/components/follow/FollowQuery.vue @@ -0,0 +1,400 @@ + + + diff --git a/src/components/follow/follow.vue b/src/components/follow/follow.vue new file mode 100644 index 0000000..22b8c78 --- /dev/null +++ b/src/components/follow/follow.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 840167c..feb9c5f 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -1392,8 +1392,8 @@ export default { this.queueParams = { patientRegisterId: row.id } - this.dataTransOpts.plus.queue++ this.dialogWin.queue = true + this.dataTransOpts.plus.queue++ }, //修改单位体检次数 diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index fca66d7..23f5d4f 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -1242,8 +1242,8 @@ export default { this.queueParams = { patientRegisterId: row.id } - this.dataTransOpts.plus.queue++ this.dialogWin.queue = true + this.dataTransOpts.plus.queue++ }, //右击菜单 diff --git a/src/components/queue/Queue.vue b/src/components/queue/Queue.vue index 11ebfae..9d1a70a 100644 --- a/src/components/queue/Queue.vue +++ b/src/components/queue/Queue.vue @@ -43,21 +43,25 @@ size="small" @row-click="rowClickRoom" ref="roomsForAsbitem"> -
+
人工分诊排队
-
+
AI智能分诊
-
当前排队房间：
-
+
当前人员：
+
+ {{ queueRegister.patientName }} +
+
当前排队房间：
+
{{ queueRegister.roomName }}
-
当前候诊人数：
-
+
当前候诊人数：
+
{{ queueRegister.queueCount }}
-
+
关闭
@@ -97,7 +101,6 @@ export default { }, //挂载完成 mounted() { - this.funMounted() }, @@ -119,7 +122,7 @@ export default { }) .catch(err => { console.log(err) - this.$message.error({ showClose: true, message: `${err}` }) + if(err != "patientRegisterId 无值") this.$message.error({ showClose: true, message: `${err}` }) }) }, @@ -133,7 +136,11 @@ export default { if (res.code > -1) { this.roomQueueList = res.data this.roomsForAsbitem = [] - return postapi('/api/app/QueueRegister/GetNotTriageAsbitemList', { patientRegisterId }) + if(patientRegisterId){ + return postapi('/api/app/QueueRegister/GetNotTriageAsbitemList', { patientRegisterId }) + }else{ + reject('patientRegisterId 无值') + } } else { reject(res.message) } @@ -141,7 +148,11 @@ export default { .then(res => { if (res && res.code > -1) { this.notTriageAsbitemList = res.data - return postapi('/api/app/QueueRegister/GetYesTriageAsbitemList', { patientRegisterId }) + if(patientRegisterId){ + return postapi('/api/app/QueueRegister/GetYesTriageAsbitemList', { patientRegisterId }) + }else{ + reject('patientRegisterId 无值') + } } else { reject(res.message) } @@ -149,7 +160,11 @@ export default { .then(res => { if (res && res.code > -1) { this.yesTriageAsbitemList = res.data - return postapi('/api/app/QueueRegister/GetQueueRegisterByPatientRegisterId', { patientRegisterId }) + if(patientRegisterId){ + return postapi('/api/app/QueueRegister/GetQueueRegisterByPatientRegisterId', { patientRegisterId }) + }else{ + reject('patientRegisterId 无值') + } } else { reject(res.message) } diff --git a/src/router/index.js b/src/router/index.js index 6d911b2..b2ac302 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -465,6 +465,12 @@ const routes = [{ name: "从文件导入检验结果", component: () => import ("../views/doctorCheck/lisResultImport.vue"), + }, + { + path: "/follow", + name: "随访管理", + component: () => + import ("../components/follow/follow.vue"), }, //---------------------- 体 检 end ---------------------- //---------------------- 体检查询 start ---------------------- diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index 49d33ac..cba7faa 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -398,6 +398,9 @@ export default { if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false } break; + case 'btnCritical': + if (RegisterCheckEdit.isAudit && RegisterCheckEdit.isAudit != 'Y') ret = false + break; case 'audit': if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag != '0' && RegisterCheckEdit.isAudit && RegisterCheckEdit.isAudit != 'Y') ret = false break;