From e41cb44dc302b51534036b3cf114dd2d5bc4f809 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 29 九月 2026 14:32:49 +0800
Subject: [PATCH] 修改了数据采集
---
src/views/ecg/doctor/components/RoutinePanel.vue | 267 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 183 insertions(+), 84 deletions(-)
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 076ce48..32526e4 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -1,55 +1,112 @@
<!-- 甯歌妫�鏌� 鍖荤敓鐣岄潰-->
<template>
- <el-form
- ref="formRef"
- :model="formData"
- :rules="formRules"
- label-width="100px"
- v-loading="formLoading"
- >
+ <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
<el-row :gutter="20">
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="鎮h�呯紪鍙�" prop="patId">
- <el-input
- v-model="formData.patId"
- placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
- @input="getRentInfoByPatId"
- />
- <!-- <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
+ <!--
+ <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />
<Barcode v-if="displayBarCode" :value="displayBarCode" :width="100" />
<el-button @click="copyBarcode()">澶嶅埗</el-button>
+ -->
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="鎮h�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
- <el-form-item label="鎮h�呮弿杩�" prop="patDetails">
- <dict-tag
- v-if="formData.patDetails?.source"
- :type="DICT_TYPE.ECG_PAT_SOURCE"
- :value="formData.patDetails?.source"
- />
- {{ formData?.patDetails?.deptDesc }} {{ formData?.patDetails?.wardDesc }}
- {{ formData?.patDetails?.bedNo }}
- </el-form-item>
- <el-form-item label="妫�鏌ユ椂闂�" prop="rentTime">
- <el-date-picker
- v-model="formData.rentTime"
- type="date"
- value-format="x"
- placeholder="閫夋嫨瑁呮満鏃堕棿"
- />
+ </el-col><el-col :span="6">
+ <el-form-item label="鎬у埆">
+ {{ genderText }}
</el-form-item>
</el-col>
- <el-col :span="12">
+
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="episodeId">
+ {{ formData?.patDetails?.mobile }}
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="灏辫瘖缂栧彿" prop="episodeId">
+ <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭氨璇婄紪鍙�" />
+ </el-form-item>
+ </el-col><el-col :span="6">
+ <el-form-item label="鍑虹敓鏃ユ湡">
+ {{ fmtDate(formData.patBirthday) }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞撮緞">
+ {{ ageText }}
+ </el-form-item>
+ </el-col><el-col :span="6">
+ <el-form-item label="寮�鍗曞尰甯�">
+ {{ formData.doctor }}
+ </el-form-item>
+ </el-col>
+
+
+ </el-row>
+ <el-row><el-col :span="6">
+ <el-form-item label="鐢宠鍗曞彿" prop="applyNo">
+ <el-input v-model="formData.applyNo" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="18">
+ <el-form-item label="绉戝鐥呭尯" prop="patDetails">
+ <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE"
+ :value="formData.patDetails?.source" />
+ {{ formData?.patDetails?.deptDesc }}-{{ formData?.patDetails?.wardDesc }}-{{ formData?.patDetails?.bedNo }}
+ </el-form-item></el-col>
+
+
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="寮�鍗曟棩鏈�">
+ {{ fmtDate(formData.doctorTime) }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璺濅粖澶╂暟">
+ {{ daysFromOrder }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍖诲槺鍙�">
+ {{ formData.applyNo }}
+ </el-form-item>
+ </el-col><el-col :span="6">
+ <el-form-item label="鐧昏鏃堕棿">
+ {{ fmtDate(formData.registerDate) }}
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="妫�鏌ユ椂闂�" prop="rentTime">
+ <el-date-picker v-model="formData.rentTime" type="date" value-format="x" placeholder="閫夋嫨鏃堕棿" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="妫�鏌ラ」鐩�" prop="">
{{ formData?.checkType && getCheckTypeName(formData?.checkType) }}
</el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="澶氳�愯嵂" prop="tolerance">
+ <el-tag v-if="formData.tolerance == 0" type="info">鍚�</el-tag>
+ <el-tag v-else-if="formData.tolerance == 1" type="danger">鏄�</el-tag>
+ <el-tag v-else type="warning">鏈煡</el-tag>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-form-item label="鏄惁澶氳��" prop="tolerance">
- <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
- <el-tag type="danger" v-else>鏄�</el-tag>
</el-form-item>
</el-col>
</el-row>
@@ -57,30 +114,14 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
<el-button @click="cancelInstall" :disabled="formLoading">鏀惧純妫�鏌�</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
- <el-button @click="yddownload()">骞虫澘杩愬姩蹇冪數鍥剧煡鎯呭悓鎰忎功</el-button>
- <el-button @click="sgdownload()">椋熺蹇冭剰鐢电敓鐞嗚瘖鐤楃煡鎯呭悓鎰忎功</el-button>
- <el-button
- v-if="needAutoFeeConfirm(formData.checkType)"
- @click="feeConfirm"
- :disabled="formLoading"
- >纭垂</el-button
- >
- <el-button
- v-if="needAutoFeeConfirm(formData.checkType)"
- @click="feeCancel"
- :disabled="formLoading"
- >鍙栨秷纭垂</el-button
- >
+ <el-button @click="yddownload()" :loading="yddownloadLoading" :disabled="yddownloadLoading">骞虫澘杩愬姩蹇冪數鍥剧煡鎯呭悓鎰忎功</el-button>
+ <el-button @click="sgdownload()" :loading="sgdownloadLoading" :disabled="sgdownloadLoading">椋熺蹇冭剰鐢电敓鐞嗚瘖鐤楃煡鎯呭悓鎰忎功</el-button>
+ <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+ <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
- <el-table
- v-loading="loading"
- :data="list"
- :stripe="true"
- :show-overflow-tooltip="true"
- @row-click="onRowClick"
- >
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick">
<!-- <el-table-column label="id" align="center" prop="id" />-->
<el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="lost">
<template #default="scope">
@@ -94,22 +135,10 @@
<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />-->
<el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="鎮h�呭悕绉�" align="center" prop="patName" />
- <el-table-column
- label="浣滀笟鏃堕棿"
- align="center"
- prop="jobTime"
- :formatter="dateFormatter"
- width="180px"
- />
+ <el-table-column label="浣滀笟鏃堕棿" align="center" prop="jobTime" :formatter="dateFormatter" width="180px" />
<!-- <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />-->
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column
- label="鍒涘缓鏃堕棿"
- align="center"
- prop="createTime"
- :formatter="dateFormatter"
- width="180px"
- />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<!--
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
@@ -134,12 +163,8 @@
-->
</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>
</template>
@@ -150,7 +175,9 @@
import { dateFormatter } from '@/utils/formatTime'
import { JobRecordApi, JobRecordVO } from '@/api/ecg/jobrecord'
import { isStringEmpty } from '@/utils/stringUtil'
-import { curDayEnd, curDayStart } from '@/utils/dateUtil'
+import { calculateAge, curDayEnd, curDayStart, formatTimestamp } from '@/utils/dateUtil'
+import { calGender } from '@/utils'
+import dayjs from 'dayjs'
import { QueueVO } from '@/api/ecg/queue'
import { RoomBedVO, DoctorApi } from '@/api/ecg/doctor'
import { Barcode } from '@/components/Barcode'
@@ -183,6 +210,14 @@
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
+ // 浠ヤ笅瀛楁鐢卞悗绔粠棰勭害鍗曡ˉ榻愶紙queue 琛ㄤ笉瀛橈級锛岀敤浜庡尰鐢熺灞曠ず
+ formData.value.patGender = queueVO?.patGender
+ formData.value.patGender = queueVO?.patGender
+ formData.value.tolerance = queueVO?.tolerance
+ formData.value.patBirthday = queueVO?.patBirthday
+ formData.value.registerDate = queueVO?.registerDate
+ formData.value.doctor = queueVO?.doctor
+ formData.value.doctorTime = queueVO?.doctorTime
getFreeRentInfo(formData.value)
copyBarcode()
}
@@ -192,7 +227,8 @@
const message = useMessage() // 娑堟伅寮圭獥
const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
+const yddownloadLoading = ref(false);
+const sgdownloadLoading = ref(false);
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const formData = ref<Partial<DevRentVO>>({
@@ -200,12 +236,46 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ patGender: undefined,
patDetails: undefined,
checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
+ tolerance: undefined,
+ patBirthday: undefined,
+ registerDate: undefined,
+ doctor: undefined,
+ doctorTime: undefined,
remark: undefined,
paid: undefined
+})
+
+/** 鍚庣鏃ユ湡缁熶竴鏄绉掓椂闂存埑锛岃浆鎴� YYYY-MM-DD 灞曠ず */
+const fmtDate = (value?: number | null) => (value ? formatTimestamp(value as unknown as Date) : '')
+
+// 鎬у埆锛�1 鐢� 2 濂炽�備负绌烘椂涓嶈蛋 calGender锛堝畠浼氭妸绌哄�煎綋鎴�"濂�"锛�
+const genderText = computed(() => {
+ const gender = formData.value.patGender
+ return gender === 1 || gender === 2 ? calGender(gender) : ''
+})
+
+// 骞撮緞锛氭寜鍑虹敓鏃ユ湡璁$畻
+const ageText = computed(() => {
+ const birthday = formData.value.patBirthday
+ if (!birthday) {
+ return ''
+ }
+ const age = calculateAge(birthday as unknown as Date)
+ return Number.isFinite(age) ? `${age}宀乣 : ''
+})
+
+// 璺濅粖澶╂暟锛氭寜寮�鍗曟棩鏈燂紙doctorTime锛夎绠�
+const daysFromOrder = computed(() => {
+ const orderTime = formData.value.doctorTime
+ if (!orderTime) {
+ return ''
+ }
+ return `${dayjs().startOf('day').diff(dayjs(orderTime).startOf('day'), 'day')}澶ー
})
const formRules = reactive({
@@ -251,9 +321,15 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ patGender: undefined,
checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
+ tolerance: undefined,
+ patBirthday: undefined,
+ registerDate: undefined,
+ doctor: undefined,
+ doctorTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
@@ -266,14 +342,37 @@
formRef.value?.resetFields()
}
const yddownload = async () => {
- const obj = await DoctorApi.yddownload(props.setappointmentId)
- console.log(obj,'xml');
-
- downloadWordFile(obj, '骞虫澘杩愬姩蹇冪數鍥剧煡鎯呭悓鎰忎功.doc');
+ // 妫�鏌� setappointmentId 鏄惁瀛樺湪
+ if (!props.setappointmentId) {
+ message.warning('褰撳墠鏃犲氨璇婁腑鎮h�呰鍏堝彨鍙�')
+ return
+ }
+
+ yddownloadLoading.value = true
+ try {
+ const response = await DoctorApi.yddownload(props.setappointmentId)
+ console.log(response, 'xml1')
+ console.log(response.fileContent, 'xml2')
+ downloadWordFile(response.fileContent, response.fileName)
+ } finally {
+ yddownloadLoading.value = false
+ }
}
+
const sgdownload = async () => {
- const obj = await DoctorApi.sgdownload(props.setappointmentId)
- downloadWordFile(obj, '椋熺蹇冭剰鐢电敓鐞嗚瘖鐤楃煡鎯呭悓鎰忎功.doc');
+ // 妫�鏌� setappointmentId 鏄惁瀛樺湪
+ if (!props.setappointmentId) {
+ message.warning('褰撳墠鏃犲氨璇婁腑鎮h�呰鍏堝彨鍙�')
+ return
+ }
+
+ sgdownloadLoading.value = true
+ try {
+ const response = await DoctorApi.sgdownload(props.setappointmentId)
+ downloadWordFile(response.fileContent, response.fileName)
+ } finally {
+ sgdownloadLoading.value = false
+ }
}
const downloadWordFile = (data, filename = 'document') => {
try {
--
Gitblit v1.9.3