From 6ab4b1e0b68e4c347110e37018fa005603f53904 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 29 九月 2026 23:49:04 +0800
Subject: [PATCH] ai优化

---
 src/views/ecg/queue/index.vue |  213 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 159 insertions(+), 54 deletions(-)

diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 55a5728..b1d5f8f 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -67,6 +67,7 @@
       </el-form-item>
       <el-form-item label="鎺掗槦鐘舵��" prop="status">
         <el-select
+          multiple
           v-model="queryParams.status"
           placeholder="璇烽�夋嫨鎺掗槦鐘舵��"
           clearable
@@ -129,32 +130,146 @@
   <!-- 鍒楄〃 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <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="episodeId" min-width="110px"/>
+      <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="鎮h�呯紪鍙�" align="center" prop="patId" />
-      <el-table-column label="鎮h�呭鍚�" align="center" min-width="120px">
+      <!-- 鏈垪鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級銆傚師鍥狅紙璇﹁銆婇儴缃叉竻鍗曘��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">
-          {{scope.row.patName}} ({{genderFormat(scope.row.patGender)}})
+          <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>
-      <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" >
+      <!-- 闇�姹�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">
-          {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
+          {{ scope.row.doctorAdviceNo || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="鎮h�呰鎯�" align="center" prop="patDetails" />
-      <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="patGender" width="70px">
+        <template #default="scope">{{ genderFormat(scope.row.patGender) }}</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" 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" prop="bookCheckType" min-width="100px">
+        <template #default="scope">
+          {{getCheckTypeName(scope.row.bookCheckType)}}
+        </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="棰勭害鏃舵" 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="bookSeqNum" />
-      <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
-      <el-table-column label="VIP" align="center" prop="isVip" />
       <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="澶氳�愯嵂" 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="VIP" align="center" prop="isVip" />
       <el-table-column label="杩囧彿鏍囪" align="center" prop="passed" />
       <el-table-column label="杩囨湡鏍囪" align="center" prop="expired" />
       <el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
@@ -167,46 +282,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="鎿嶄綔" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openAppointmentForm('preview', scope.row.patId)"
-            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 === 5"
-            v-hasPermi="['ecg:queue:recall']"
-          >
-            鍙洖
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <!-- 鍒嗛〉 -->
     <Pagination
@@ -233,6 +308,9 @@
 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' })
@@ -255,7 +333,7 @@
   bookTimeslot: undefined,
   bookCheckType: undefined,
   seqNum: undefined,
-  status: undefined,
+  status: [],
   passed: undefined,
   expired: undefined,
   roomId: undefined,
@@ -293,8 +371,8 @@
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
-const openAppointmentForm = (type: string, patId: string, status: number) => {
-  formRef.value.openByQueue(type, patId, status)
+const openAppointmentForm = (type: string, patId: string, checkType: number) => {
+  formRef.value.openByQueue(type, patId, checkType)
 }
 
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
@@ -325,15 +403,37 @@
   } 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) => {
   const patientVO: PatientVO = {
     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()
@@ -358,4 +458,9 @@
 onMounted(() => {
   getList()
 })
+
+onActivated(() => {
+  console.info("queue onActivated...")
+  handleQuery()
+})
 </script>

--
Gitblit v1.9.3