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/appointment/index.vue |  328 +++++++++++++++++++++--------------------------------
 1 files changed, 131 insertions(+), 197 deletions(-)

diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 28ca5c2..48bb190 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -1,65 +1,20 @@
 <template>
   <ContentWrap>
     <!-- 鎼滅储宸ヤ綔鏍� -->
-    <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-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="缂栧彿" prop="patId">
+        <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-form-item>
-      <el-form-item label="鎮h�呮�у埆" prop="patGender">
-        <el-select
-          v-model="queryParams.patGender"
-          placeholder="璇烽�夋嫨鎮h�呮�у埆"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="鎮h�呯敓鏃�" prop="patBirthday">
-        <el-date-picker
-          v-model="queryParams.patBirthday"
-          value-format="YYYY-MM-DD"
-          type="date"
-          placeholder="閫夋嫨鎮h�呯敓鏃�"
-          clearable
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="鎮h�呮墜鏈�" prop="patMobile">
-        <el-input
-          v-model="queryParams.patMobile"
-          placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patMobile" placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
+      <!--
       <el-form-item label="鎮h�呯數璇�" prop="patPhone">
         <el-input
           v-model="queryParams.patPhone"
@@ -69,93 +24,35 @@
           class="!w-240px"
         />
       </el-form-item>
+-->
       <el-form-item label="韬唤璇佸彿" prop="patIdentityId">
-        <el-input
-          v-model="queryParams.patIdentityId"
-          placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patIdentityId" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="鎮h�呭湴鍧�" prop="patAddr">
+      <!-- <el-form-item label="棰勭害缂栧彿" prop="applyNo">
         <el-input
-          v-model="queryParams.patAddr"
-          placeholder="璇疯緭鍏ユ偅鑰呭湴鍧�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ瀹や唬鐮�" prop="patDeptCode">
-        <el-input
-          v-model="queryParams.patDeptCode"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹や唬鐮�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ瀹ゅ悕绉�" prop="patDeptDesc">
-        <el-input
-          v-model="queryParams.patDeptDesc"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹ゅ悕绉�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ梾鍖轰唬鐮�" prop="patWardCode">
-        <el-input
-          v-model="queryParams.patWardCode"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖轰唬鐮�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ梾鍖哄悕绉�" prop="patWardDesc">
-        <el-input
-          v-model="queryParams.patWardDesc"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖哄悕绉�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="搴婂彿" prop="patBedNo">
-        <el-input
-          v-model="queryParams.patBedNo"
-          placeholder="璇疯緭鍏ュ簥鍙�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="棰勭害缂栧彿" prop="bookId">
-        <el-input
-          v-model="queryParams.bookId"
+          v-model="queryParams.applyNo"
           placeholder="璇疯緭鍏ラ绾︾紪鍙�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </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> -->
+      <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="registerTime">
+        <el-select v-model="queryParams.registerTime" placeholder="璇烽�夋嫨妫�鏌ラ」鐩�" clearable class="!w-240px">
+          <el-option v-for="dict in opeionregister" :key="dict.value" :label="dict.value" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鐥呭尯" prop="patWardDesc">
+        <el-input v-model="queryParams.patWardDesc" placeholder="璇疯緭鍏ョ梾鍖哄悕绉�" readonly />
+      </el-form-item>
+      <!--
       <el-form-item label="棰勭害鏉ユ簮" prop="bookSrc">
         <el-input
           v-model="queryParams.bookSrc"
@@ -165,24 +62,19 @@
           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
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['ecg:appointment:create']"
-        >
+        <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 @click="openForm('create')" v-hasPermi="['ecg:appointment:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 鏂板
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['ecg:appointment:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['ecg:appointment:export']">
           <Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
         </el-button>
       </el-form-item>
@@ -191,87 +83,121 @@
 
   <!-- 鍒楄〃 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="缂栧彿" align="center" prop="patId" />
-      <el-table-column label="濮撳悕" align="center" prop="patName" />
-      <el-table-column label="鎬у埆" align="center" prop="patGender">
+    <el-table v-loading="loading" :data="appointmentList" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="鐢宠鍙�" align="center" prop="applyNo" min-width="110px" />
+      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+      <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 浠嶆寜鍊煎舰鎬佺粰鍑�**鏉ユ簮鏍囨敞**锛堣韩浠借瘉/浣忛櫌鍙�/闂ㄨ瘖鍙凤級锛�
+           渚夸簬鍖哄垎娣峰湪 outpatient_no 閲岀殑韬唤璇佸彿銆� -->
+      <el-table-column label="闂ㄨ瘖鍙�" align="center" min-width="140px">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="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="patBirthday" :formatter="dateFormatter2" width="110px"/>
-      <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
-      <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />
-      <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />
-      <el-table-column label="鍦板潃" align="center" prop="patAddr" />
-      <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" />
-      <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
-      <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" />
-      <el-table-column label="鐥呭尯鍚嶇О" align="center" prop="patWardDesc" />
-      <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
-      <el-table-column label="棰勭害缂栧彿" align="center" prop="bookId" />
-      <el-table-column
-        label="棰勭害鏃ユ湡"
-        align="center"
-        prop="bookDate"
-        :formatter="dateFormatter2"
-        width="120px"
-      />
+      <el-table-column label="濮撳悕" align="center" min-width="160px">
+        <template #default="scope">
+          {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
+          <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
       <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" 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">
+      <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
+          {{ getCheckTypeName(scope.row.bookCheckType) }}
         </template>
       </el-table-column>
-      <el-table-column label="棰勭害鏉ユ簮" align="center" prop="bookSrc">
+      <el-table-column label="缂磋垂" align="center" prop="paid">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ECG_BOOK_SRC" :value="scope.row.bookSrc" />
+          {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
         </template>
       </el-table-column>
+      <!-- 闇�姹�1锛氱姸鎬� -->
+      <!-- 娉ㄦ剰锛氬繀椤绘樉寮忓垽绌猴紝涓嶈兘鐢� v-if="scope.row.status" 鈥斺��
+           鐘舵�� '0'锛堟湭鐧昏锛夋槸鍚堟硶鍊硷紝鐪熷�煎垽鏂細鎶婂畠璇垽涓�"鏃犳暟鎹�"鑰屾樉绀� '-' -->
+      <el-table-column label="鐘舵��" align="center" prop="status" width="110px">
+        <template #default="scope">
+          <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
+            :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <!-- 闇�姹�1锛氬勾榫勶紙搴撲腑鏃犳鍒楋紝鐢辩敓鏃ュ疄鏃惰绠楋級 -->
+      <el-table-column label="骞撮緞" align="center" width="80px">
+        <template #default="scope">{{ formatAge(scope.row.patBirthday) }}</template>
+      </el-table-column>
+      <!-- 闇�姹�1锛氬紑鍗曟棩鏈� + 璺濅粖澶╂暟 -->
+      <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>
+      <!-- 闇�姹�1锛氬紑鍗曞尰甯� -->
+      <el-table-column label="寮�鍗曞尰甯�" align="center" prop="doctor" min-width="100px">
+        <template #default="scope">{{ scope.row.doctor || '-' }}</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="registerDate" />
+      <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" />
+      <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
+      <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" />
+      <el-table-column label="鐥呭尯鍚嶇О" align="center" prop="patWardDesc" />
+      <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
+      <el-table-column label="鐢熸棩" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px" />
+      <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
+      <!--      <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />-->
+      <!--      <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />-->
+      <el-table-column label="鍦板潃" align="center" prop="patAddr" />
       <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:appointment:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['ecg:appointment:update']">
             缂栬緫
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['ecg:appointment:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:appointment:delete']">
             鍒犻櫎
           </el-button>
         </template>
       </el-table-column>
     </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>
 
   <!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
-  <AppointmentForm ref="formRef" @success="getList" />
+  <AppointmentForm ref="formRef" @event_appointment_success="getList" />
 </template>
 
 <script setup lang="ts">
-import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter2 } from '@/utils/formatTime'
+// 闇�姹�1锛氬勾榫� / 璺濅粖澶╂暟 / 寮�鍗曟棩鏈熸牸寮忓寲锛堝簱涓棤瀵瑰簲鍒楋紝闇�瀹炴椂璁$畻锛�
+import { formatAge, formatDaysFromOrder, formatDateTime, resolveCardNo } from '@/utils/patientInfo'
 import download from '@/utils/download'
 import { AppointmentApi, AppointmentVO } from '@/api/ecg/appointment'
 import AppointmentForm from './AppointmentForm.vue'
+import { useCheckTypeStore } from "@/store/modules/checkType";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
 
 /** 棰勭害 鍒楄〃 */
 defineOptions({ name: 'Appointment' })
@@ -280,11 +206,13 @@
 const { t } = useI18n() // 鍥介檯鍖�
 
 const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
-const list = ref<AppointmentVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const appointmentList = ref<AppointmentVO[]>([]) // 鍒楄〃鐨勬暟鎹�
 const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁�
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  applyNo: undefined,
+  registerTime: undefined,
   patId: undefined,
   patName: undefined,
   patGender: undefined,
@@ -298,21 +226,27 @@
   patWardCode: undefined,
   patWardDesc: undefined,
   patBedNo: undefined,
-  bookId: undefined,
   bookDate: undefined,
   bookTimeslot: undefined,
   bookCheckType: undefined,
   bookSrc: undefined
 })
 const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
+const opeionregister = ref([
+  { value: '鍏ㄩ儴', label: '鍏ㄩ儴' },
+  { value: '涓婂崍', label: '涓婂崍' },
+  { value: '涓嬪崍', label: '涓嬪崍' }
+]) // 鎼滅储鐨勮〃鍗�
 const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
+
+const checkTypeStore = useCheckTypeStore();
 
 /** 鏌ヨ鍒楄〃 */
 const getList = async () => {
   loading.value = true
   try {
     const data = await AppointmentApi.getAppointmentPage(queryParams)
-    list.value = data.list
+    appointmentList.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -347,7 +281,7 @@
     message.success(t('common.delSuccess'))
     // 鍒锋柊鍒楄〃
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3