From 936c01060eea0924b88ca5c35d221a972a6aba7d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 十月 2026 10:47:22 +0800
Subject: [PATCH] 检查单列表调整
---
src/views/ecg/queue/index.vue | 358 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 204 insertions(+), 154 deletions(-)
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 7841c12..6e071dd 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -1,106 +1,53 @@
<template>
<ContentWrap>
<!-- 鎼滅储宸ヤ綔鏍� -->
- <el-form
- class="-mb-15px"
- :model="queryParams"
- ref="queryFormRef"
- :inline="true"
- label-width="68px"
- >
+ <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="鎮h�呯紪鍙�" prop="patId">
- <el-input
- v-model="queryParams.patId"
- placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <el-input v-model="queryParams.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
</el-form-item>
<el-form-item label="鎮h�呭鍚�" prop="patName">
- <el-input
- v-model="queryParams.patName"
- placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <el-input v-model="queryParams.patName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
</el-form-item>
<el-form-item label="棰勭害鏃舵" prop="bookTimeslot">
- <el-select
- v-model="queryParams.bookTimeslot"
- placeholder="璇疯緭鍏ラ绾︽椂娈�"
- clearable
- class="!w-240px"
- >
- <el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.ECG_BOOK_TIMESLOT)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.bookTimeslot" placeholder="璇疯緭鍏ラ绾︽椂娈�" clearable class="!w-240px">
+ <el-option v-for="dict in getIntDictOptions(DICT_TYPE.ECG_BOOK_TIMESLOT)" :key="dict.value"
+ :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
- <el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
- <el-select
- v-model="queryParams.bookCheckType"
- placeholder="璇烽�夋嫨妫�鏌ョ被鍨�"
- clearable
- class="!w-240px"
- >
- <el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-form-item label="妫�鏌ラ」鐩�" prop="bookCheckType">
+ <el-select v-model="queryParams.bookCheckType" placeholder="璇烽�夋嫨妫�鏌ラ」鐩�" clearable class="!w-240px">
+ <el-option v-for="dict in checkTypeStore.getCheckTypeOptions()" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鎺掗槦搴忓彿" prop="seqNum">
- <el-input
- v-model="queryParams.seqNum"
- placeholder="璇疯緭鍏ユ帓闃熷簭鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <el-input v-model="queryParams.seqNum" placeholder="璇疯緭鍏ユ帓闃熷簭鍙�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
</el-form-item>
<el-form-item label="鎺掗槦鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="璇烽�夋嫨鎺掗槦鐘舵��"
- clearable
- class="!w-240px"
- >
- <el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.ECG_QUEUE_STATUS)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select multiple v-model="queryParams.status" placeholder="璇烽�夋嫨鎺掗槦鐘舵��" clearable class="!w-240px">
+ <el-option v-for="dict in getIntDictOptions(DICT_TYPE.ECG_QUEUE_STATUS)" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="璇婂缂栧彿" prop="roomId">
- <el-input
- v-model="queryParams.roomId"
- placeholder="璇疯緭鍏ヨ瘖瀹ょ紪鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <el-input v-model="queryParams.roomId" placeholder="璇疯緭鍏ヨ瘖瀹ょ紪鍙�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
</el-form-item>
<el-form-item label="璇婄枟搴婂彿" prop="bedNo">
- <el-input
- v-model="queryParams.bedNo"
- placeholder="璇疯緭鍏ヨ瘖鐤楀簥鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <el-input v-model="queryParams.bedNo" placeholder="璇疯緭鍏ヨ瘖鐤楀簥鍙�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
</el-form-item>
<el-form-item>
- <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
+ <el-button @click="handleQuery">
+ <Icon icon="ep:search" class="mr-5px" /> 鎼滅储
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆
+ </el-button>
+ <!--
<el-button
type="primary"
plain
@@ -109,6 +56,8 @@
>
<Icon icon="ep:plus" class="mr-5px" /> 鏂板
</el-button>
+-->
+ <!--
<el-button
type="success"
plain
@@ -118,6 +67,7 @@
>
<Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
</el-button>
+-->
</el-form-item>
</el-form>
</ContentWrap>
@@ -125,103 +75,172 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="id" align="center" prop="id" />
+ <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <template #default="scope">
+ <!-- <el-button
+ link
+ type="primary"
+ @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
+ v-hasPermi="['ecg:appointment:preview']"
+ >
+ 鏌ョ湅
+ </el-button>-->
+ <!--
+ <el-button
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['ecg:queue:delete']"
+ >
+ 鍒犻櫎
+ </el-button>
+ -->
+ <el-button link type="danger" @click="handleJump(scope.row)" v-if="scope.row.status === 10"
+ v-hasPermi="['ecg:queue:jump']">
+ {{ scope.row.jumpFlag === 0 ? "鍔犳��" : "鍙栨秷鍔犳��" }}
+ </el-button>
+ <el-button link type="danger" @click="recall(scope.row)"
+ v-if="scope.row.status === 3 || scope.row.status === 5 || scope.row.status === 7"
+ v-hasPermi="['ecg:queue:recall']">
+ 鍙洖
+ </el-button>
+ <el-button link type="danger" @click="passWaitingPatient(scope.row)" v-if="scope.row.status === 10"
+ v-hasPermi="['ecg:queue:pass']">
+ 杩囧彿
+ </el-button>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="id" align="center" prop="id" />-->
+ <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
+ <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
+ <el-table-column label="棰勭害鍙�" align="center" prop="bookSeqNum" />
+ <el-table-column label="杩囧彿鏍囪" align="center" prop="passed" />
<el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
- <el-table-column label="鎮h�呭鍚�" align="center" prop="patName" />
- <el-table-column label="鎮h�呮�у埆" align="center" prop="patGender" />
- <el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" >
+ <el-table-column label="鎮h�呭鍚�" align="center" prop="patName" min-width="90px" /><el-table-column label="妫�鏌ラ」鐩�"
+ align="center" prop="bookCheckType" min-width="100px">
+ <template #default="scope">
+ {{ getCheckTypeName(scope.row.bookCheckType) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏉ユ簮" align="center" width="90px">
+ <template #default="scope">
+ <!-- 浼樺厛鐢ㄩ绾﹀崟骞抽摵鍊硷紝鍥為��鍒� patDetails 蹇収 -->
+ <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc ?? scope.row.patDetails?.source ?? 0" />
+ </template>
+ </el-table-column>
+ <el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" min-width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
</template>
</el-table-column>
- <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" >
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
- </template>
- </el-table-column>
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
- <el-table-column label="鐘舵��" align="center" prop="status" >
+ <el-table-column label="鐘舵��" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
- <el-table-column label="杩囧彿鏍囪" align="center" prop="passed" />
+ <el-table-column label="VIP" align="center" prop="isVip" />
+ <el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
+ <!-- 鏈垪鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級銆傚師鍥狅紙璇﹁銆婇儴缃叉竻鍗曘��5.1锛夛細
+ HIS 鍦ㄥ崱鍙锋Ы浣嶄紶绌猴紝medical_card 鍏ㄥ簱 159,116 琛�**鏃犱竴闈炵┖**锛�
+ 瀹炴祴璇ュ垪 99.9% 鏄剧ず鐨勬槸 outpatient_no锛�65% 褰㈠韬唤璇併��35% 涓洪棬璇婂彿锛夈��
+ resolveCardNo 浠嶆寜鍊煎舰鎬佺粰鍑�**鏉ユ簮鏍囨敞**锛堣韩浠借瘉/浣忛櫌鍙�/闂ㄨ瘖鍙凤級銆� -->
+ <el-table-column label="闂ㄨ瘖鍙�" align="center" min-width="140px">
+ <template #default="scope">
+ <span>{{ resolveCardNo(scope.row).value }}</span>
+ <el-tag v-if="resolveCardNo(scope.row).from" size="small" type="info" effect="plain" class="ml-1">
+ {{ resolveCardNo(scope.row).from }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
+ 璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
+ <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
+ <template #default="scope">
+ {{ scope.row.doctorAdviceNo || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎬у埆" align="center" prop="patGender" width="70px">
+ <template #default="scope">{{ genderFormat(scope.row.patGender) }}</template>
+ </el-table-column>
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" min-width="110px">
+ <template #default="scope">{{ formatDateOnly(scope.row.patBirthday) }}</template>
+ </el-table-column>
+ <el-table-column label="骞撮緞" align="center" width="80px">
+ <template #default="scope">{{ formatAge(scope.row.patBirthday) }}</template>
+ </el-table-column>
+
+ <el-table-column label="鐥呭尯" align="center" min-width="110px">
+ <template #default="scope">{{ scope.row.patWardDesc || scope.row.patDetails?.wardDesc || '-' }}</template>
+ </el-table-column>
+ <el-table-column label="鐥呭簥鍙�" align="center" width="90px">
+ <template #default="scope">
+ <!-- 娉ㄦ剰锛歴cope.row.bedNo 鏄�愯瘖鐤楀簥銆�(宸ヤ綅)锛屼笉鏄梾搴婂彿锛�
+ 鐥呭簥鍙峰彇 patBedNo / patDetails.bedNo -->
+ {{ scope.row.patBedNo || scope.row.patDetails?.bedNo || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎮h�呯數璇�" align="center" min-width="120px">
+ <template #default="scope">
+ {{ scope.row.patMobile || scope.row.patPhone || scope.row.patDetails?.mobile || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鐧昏鏃堕棿" align="center" min-width="150px">
+ <template #default="scope">{{ formatDateTime(scope.row.registerDate) }}</template>
+ </el-table-column>
+ <el-table-column label="寮�鍗曟棩鏈�" align="center" min-width="150px">
+ <template #default="scope">{{ formatDateTime(scope.row.doctorTime) }}</template>
+ </el-table-column>
+ <el-table-column label="璺濅粖澶╂暟" align="center" width="90px">
+ <template #default="scope">{{ formatDaysFromOrder(scope.row.doctorTime) }}</template>
+ </el-table-column>
+ <el-table-column label="寮�鍗曞尰甯�" align="center" prop="doctor" min-width="100px">
+ <template #default="scope">{{ scope.row.doctor || '-' }}</template>
+ </el-table-column>
+
+ <el-table-column label="澶氳�愯嵂" width="150" align="center" prop="tolerance">
+ <template #default="scope">
+ <!-- 闇�姹�6锛氬鑰愯蛋瀛楀吀锛汵ULL 鎸�"鏃�"鏄剧ず锛圦12锛� -->
+ <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+ </template>
+ </el-table-column>
<el-table-column label="杩囨湡鏍囪" align="center" prop="expired" />
<el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
<el-table-column label="璇婂鍚嶇О" align="center" prop="roomName" />
<el-table-column label="璇婄枟搴婂彿" align="center" prop="bedNo" />
- <el-table-column
- label="鍒涘缓鏃堕棿"
- align="center"
- prop="createTime"
- :formatter="dateFormatter"
- width="180px"
- />
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
- <template #default="scope">
- <el-button
- link
- type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['ecg:queue:update']"
- >
- 缂栬緫
- </el-button>
- <el-button
- link
- type="danger"
- @click="handleDelete(scope.row.id)"
- v-hasPermi="['ecg:queue:delete']"
- >
- 鍒犻櫎
- </el-button>
- <el-button
- link
- type="danger"
- @click="handleJump(scope.row)"
- v-if="scope.row.status === 10"
- v-hasPermi="['ecg:queue:jump']"
- >
- {{scope.row.jumpFlag === 0? "鎻掗槦" : "鍙栨秷鎻掗槦"}}
- </el-button>
- <el-button
- link
- type="danger"
- @click="recall(scope.row)"
- v-if="scope.row.status === 5"
- v-hasPermi="['ecg:queue:recall']"
- >
- 鍙洖
- </el-button>
- </template>
- </el-table-column>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
</el-table>
<!-- 鍒嗛〉 -->
- <Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+ @pagination="getList" />
</ContentWrap>
<!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
- <queueForm ref="formRef" @success="getList" />
+ <!-- <queueForm ref="formRef" @success="getList" />-->
+
+ <!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
+ <AppointmentForm ref="formRef" @event_appointment_success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { QueueApi, QueueVO } from '@/api/ecg/queue'
-import queueForm from './QueueForm.vue'
-import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
-import {DoctorApi, PatientVO} from "@/api/ecg/doctor";
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DoctorApi, PatientVO } from "@/api/ecg/doctor";
+import { useCheckTypeStore } from "@/store/modules/checkType";
+import AppointmentForm from "@/views/ecg/appointment/AppointmentForm.vue";
+import { genderFormat } from "@/utils/stringUtil";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
+// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭殑鍏叡鏍煎紡鍖栵紙骞撮緞銆佽窛浠婂ぉ鏁扮瓑锛�
+import { formatAge, formatDaysFromOrder, formatDateTime, formatDateOnly, resolveCardNo } from '@/utils/patientInfo'
/** 鎺掗槦 鍒楄〃 */
defineOptions({ name: 'queue' })
const message = useMessage() // 娑堟伅寮圭獥
const { t } = useI18n() // 鍥介檯鍖�
+
+const checkTypeStore = useCheckTypeStore();
const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
const list = ref<QueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
@@ -232,10 +251,11 @@
patId: undefined,
patName: undefined,
patGender: undefined,
+ patDetails: undefined,
bookTimeslot: undefined,
bookCheckType: undefined,
seqNum: undefined,
- status: undefined,
+ status: [],
passed: undefined,
expired: undefined,
roomId: undefined,
@@ -273,6 +293,9 @@
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
+const openAppointmentForm = (type: string, patId: string, checkType: number) => {
+ formRef.value.openByQueue(type, patId, checkType)
+}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (id: number) => {
@@ -284,11 +307,11 @@
message.success(t('common.delSuccess'))
// 鍒锋柊鍒楄〃
await getList()
- } catch {}
+ } catch { }
}
/** 鎻掗槦鎸夐挳鎿嶄綔 */
-const handleJump = async (item: QueueVO ) => {
+const handleJump = async (item: QueueVO) => {
try {
if (item.jumpFlag === 0)
item.jumpFlag = 1
@@ -299,7 +322,19 @@
message.success(data)
// 鍒锋柊鍒楄〃
await getList()
- } catch {}
+ } catch { }
+}
+
+const passWaitingPatient = async (item: QueueVO) => {
+ const patientVO: PatientVO = {
+ patId: item.patId,
+ checkType: item.bookCheckType,
+ }
+
+ const data = await DoctorApi.passWaitingPatient(patientVO);
+ message.info(data)
+ // 鍒锋柊鍒楄〃
+ await getList()
}
const recall = async (item: QueueVO) => {
@@ -307,10 +342,20 @@
roomId: item.roomId,
bedNo: item.bedNo,
patId: item.patId,
- jumpFlag: 0
+ checkType: item.bookCheckType,
+ //jumpFlag: 0,
+ roomId_operator: item.roomId, // 闃熷垪鐣岄潰 鍙洖鎿嶄綔鏃� 淇濇寔鍘熸潵鐨勫伐浣�
+ bedNo_operator: item.bedNo, // 闃熷垪鐣岄潰 鍙洖鎿嶄綔鏃� 淇濇寔鍘熸潵鐨勫伐浣�
}
- const data = await DoctorApi.recallPatient(patientVO);
+ let data = ""
+ if (item.status === 3) // 鎺掗槦涓� 鎮h�� 杩囧彿
+ data = await DoctorApi.recallPassWaitingPatient(patientVO);
+ else if (item.status === 5) // 甯歌銆侀鐢� 杩囧彿
+ data = await DoctorApi.recallPatient(patientVO);
+ else if (item.status === 7)
+ data = await DoctorApi.recallInstallPatient(patientVO);
+
message.info(data)
// 鍒锋柊鍒楄〃
await getList()
@@ -335,4 +380,9 @@
onMounted(() => {
getList()
})
+
+onActivated(() => {
+ console.info("queue onActivated...")
+ handleQuery()
+})
</script>
--
Gitblit v1.9.3