From b6200ca167033983858e96a1176a149dd43d37a5 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 04 十一月 2024 09:51:34 +0800 Subject: [PATCH] update --- src/views/ecg/doctor/components/DevReadyPanel.vue | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue index 7b8131f..c058733 100644 --- a/src/views/ecg/doctor/components/DevReadyPanel.vue +++ b/src/views/ecg/doctor/components/DevReadyPanel.vue @@ -130,11 +130,12 @@ import {dateFormatter} from "@/utils/formatTime"; import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage"; -import {curDayEnd, curDayStart} from "@/utils/dateUtil"; +import {calculateAge, curDayEnd, curDayStart, formatTimestamp} from "@/utils/dateUtil"; import {RoomBedVO} from "@/api/ecg/doctor"; import {hiprint} from "vue-plugin-hiprint"; import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment"; import { useCheckTypeStoreWithOut } from '@/store/modules/checkType' +import {PrefixInteger} from "@/utils/formatter"; /** 璁惧棰嗙敤 琛ㄥ崟 */ defineComponent({ name: 'DevReadyPanel' }) @@ -357,15 +358,15 @@ var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); //鏂囨湰 const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType) - panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: checkTypeName, textAlign: 'center' } }); - const patientBaisc = curAppointment.patName + " " + curAppointment.patGender + " " + curAppointment.patAge - panel.addPrintText({ options: { width: 140, height: 15, top: 40, left: 20, title: patientBaisc, textAlign: 'center' } }); + panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 11 } }); + const patientBaisc = curAppointment.patName + " " + calGender(curAppointment.patGender) + " " + calculateAge(curAppointment.patBirthday) + "宀�" + panel.addPrintText({ options: { width: 140, height: 15, top: 40, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 11} }); const ward_bed = curAppointment.patWardDesc + "-" + curAppointment.patBedNo - panel.addPrintText({ options: { width: 140, height: 15, top: 60, left: 20, title: ward_bed, textAlign: 'center' } }); - const bookTime = curAppointment.bookDate + "-" + getBookBeginTime(curAppointment.bookTimeslot) - panel.addPrintText({ options: { width: 140, height: 15, top: 80, left: 20, title: bookTime, textAlign: 'center' } }); - panel.addPrintText({ options: { width: 140, height: 15, top: 100, left: 20, title: curAppointment.patId, textAlign: 'center' } }); - panel.addPrintText({ options: { width: 140, height: 15, top: 120, left: 20, title: curAppointment.patMobile, textAlign: 'center' } }); + panel.addPrintText({ options: { width: 140, height: 15, top: 60, left: 20, title: ward_bed, textAlign: 'center', fontSize: 11 } }); + const bookTime = formatTimestamp(curAppointment.bookDate) + " " + getBookBeginTime(curAppointment.bookTimeslot) + panel.addPrintText({ options: { width: 140, height: 15, top: 80, left: 20, title: bookTime, textAlign: 'center', fontSize: 10 } }); + panel.addPrintText({ options: { width: 140, height: 15, top: 100, left: 20, title: curAppointment.patId, textAlign: 'center', fontSize: 10} }); + panel.addPrintText({ options: { width: 140, height: 15, top: 120, left: 20, title: curAppointment.patMobile, textAlign: 'center', fontSize: 10 } }); //鏉″舰鐮� panel.addPrintText({ options: { width: 140, height: 35, top: 140, left: 20, title: curAppointment.patId, textType: 'barcode' } }); @@ -410,13 +411,17 @@ }); */ -const getBookBeginTime = (bookTimeslot: string): string => { - if (7 == bookTimeslot.length) { - return bookTimeslot.slice(0, 0) + ":" + bookTimeslot.slice(1, 2) - } else if (8 == bookTimeslot.length) { - return bookTimeslot.slice(0, 1) + ":" + bookTimeslot.slice(2, 3) - } - return "-" +const getBookBeginTime = (bookTimeslot: number): string => { + const hour = parseInt( bookTimeslot/1000000 ); + const minute = parseInt( bookTimeslot/10000 ) % 100; + return PrefixInteger(hour,2) + ":" + PrefixInteger(minute, 2); +} + +const calGender = (_gender: number): string => { + if (1 === _gender) + return "鐢�" + else + return "濂�" } const getDevInfo = async () => { -- Gitblit v1.9.3