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/doctor/components/DevReadyPanel.vue | 187 ++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 48 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 96b1d7b..831a7fb 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -9,29 +9,46 @@
:rules="formRules"
label-width="100px"
v-loading="formLoading"
+
>
+ <el-row>
+ <el-col :span="12">
<el-form-item label="妫�鏌ラ」鐩�" prop="">
- {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
+ {{getCheckTypeName(formData.checkType)}}
</el-form-item>
- <el-form-item label="鎮h�呯紪鍙�" prop="patId">
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎮h�呯紪鍙�" prop="patId" >
<el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
<Barcode v-if="displayBarCode" :value="displayBarCode" :width=100 />
<el-button @click="copyBarcode()">澶嶅埗</el-button>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鎮h�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
-
+ </el-col>
+ <!-- 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭粺涓�灞曠ず锛堝悗绔凡浠庨绾﹀崟骞抽摵鍥炲~锛宻etPatient 宸茶祴鍊煎埌 formData锛� -->
+ <PatientInfoBlock :data="formData" check-type-field="checkType" :span="12" />
+ <el-col :span="12">
+
<el-form-item label="鎮h�呮弿杩�" prop="patDeptDesc">
- <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}}
+ <dict-tag v-if="formData.patSrc ?? formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc ?? formData.patDetails?.source" />
+ {{ formData.patWardDesc || formData?.patDetails?.wardDesc || '-' }} {{ formData.patBedNo || formData?.patDetails?.bedNo || '-' }}
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璁惧鎻忚堪" prop="">
{{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
<el-date-picker
v-model="formData.rentTime"
@@ -40,6 +57,14 @@
placeholder="閫夋嫨棰嗙敤鏃堕棿"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="澶氳�愯嵂" prop="tolerance">
+ <!-- 闇�姹�6锛氱粺涓�璧板瓧鍏� ecg_tolerance锛�0=鏃� 1=澶氳�� 2=澶氶噸鑰愯嵂锛夛紱NULL 鎸�"鏃�"鏄剧ず锛圦12锛� -->
+ <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="formData.tolerance ?? 0" />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -51,15 +76,15 @@
</el-radio-group>
</el-form-item>
-->
+
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
<el-checkbox style="margin-left:10px" label="鑷姩 " v-model="autoPrint" />
- <el-button @click="printBill(formData.patId!, formData.checkType!)">鎵撳嵃灏忕エ</el-button>
- <el-button @click="printBill(formData.patId!, formData.checkType!, 8)">鎵撳嵃灏忕エ2</el-button>
+ <el-button @click="printBill(formData.patDetails?.appointmentId)">鎵撳嵃灏忕エ</el-button>
<el-button @click="cancelReady" :disabled="formLoading">鏀惧純棰嗙敤</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
- <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
- <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</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>
@@ -148,8 +173,11 @@
import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
import {useCheckTypeStore} from '@/store/modules/checkType'
import {calGender, getBookBeginTime} from "@/utils";
-import {DICT_TYPE} from "@/utils/dict";
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import {tranlateDevState} from "@/utils/statusFormatter";
+import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
+// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭粺涓�灞曠ず鍧�
+import PatientInfoBlock from "@/views/ecg/doctor/components/PatientInfoBlock.vue";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -166,15 +194,14 @@
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const autoPrint = ref<boolean>(true);
const checkTypeStore = useCheckTypeStore()
-const formData = ref<Partial<DevRentVO>>({
+const formData = ref<DevRentVO>({
+ id: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
@@ -184,8 +211,6 @@
returnTime: undefined,
remark: undefined,
paid: undefined,
- roomId: props.room.roomId,
- bedNo: props.room.bedNo
})
const formRules = reactive({
@@ -218,6 +243,9 @@
// 鏍规嵁鎮h�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
const getFreeRentInfo = async (devRentVO) => {
+ if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+ return
+
const data = await DevRentApi.getFreeRent(devRentVO)
if (null === data)
return
@@ -238,20 +266,22 @@
try {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
- const data = formData.value
- console.info( data )
+ await DevRentApi.devReady(formData.value)
- await DevRentApi.devReady(data)
+ if (autoPrint.value && formData.value.patId && formData.value.checkType) {
+ printBill(formData.value.patDetails?.appointmentId)
+ }
- if (autoPrint.value && data.patId && data.checkType)
- printBill( data.patId, data.checkType)
+ // 鑷姩纭垂
+ if (needAutoFeeConfirm(formData.value.checkType)) {
+ feeConfirm()
+ }
- dialogVisible.value = false
- // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('event_dev_ready')
resetForm()
getList()
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_dev_ready')
message.success(t('鎿嶄綔瀹屾垚'))
} finally {
formLoading.value = false
@@ -282,11 +312,30 @@
checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
+ tolerance: undefined,
remark: undefined,
patDetails: undefined,
paid: undefined,
- roomId: props.room.roomId,
- bedNo: props.room.bedNo
+ // 闇�姹�1锛歅atientInfoBlock 渚濊禆鐨勫钩閾哄瓧娈碉紝鍏堝垵濮嬪寲涓� undefined锛�
+ // 闅忓悗鐢� setPatient 浠� QueueVO 璧嬪�硷紙涓嶅垵濮嬪寲浼氳涓嶅埌灞炴�э級
+ applyNo: undefined,
+ episodeId: undefined,
+ patGender: undefined,
+ patBirthday: undefined,
+ registerDate: undefined,
+ doctor: undefined,
+ doctorTime: undefined,
+ patSrc: undefined,
+ patMobile: undefined,
+ patPhone: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
+ medicalCard: undefined,
+ doctorAdviceNo: undefined,
+ outpatientNo: undefined,
+ patIdentityId: undefined,
+ status: undefined,
+ seqNum: undefined,
}
formRef.value?.resetFields()
@@ -305,7 +354,25 @@
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
- getFreeRentInfo(formData.value)
+ formData.value.tolerance = queueVO?.tolerance // 澶氳�愯嵂锛屽悗绔粠棰勭害鍗曡ˉ榻�
+ // 闇�姹�1锛氫互涓嬪钩閾哄瓧娈电敱鍚庣浠庨绾﹀崟鍥炲~鍒� QueueRespVO锛�
+ // 蹇呴』鏄惧紡璧嬪�肩粰 formData锛屽惁鍒欐ā鏉块噷璇讳笉鍒帮紙鍘熷厛鍙祴鍊间簡涓婇潰 6 涓級銆�
+ formData.value.patGender = queueVO?.patGender
+ formData.value.patBirthday = queueVO?.patBirthday
+ formData.value.registerDate = queueVO?.registerDate
+ formData.value.doctor = queueVO?.doctor
+ formData.value.doctorTime = queueVO?.doctorTime
+ formData.value.patSrc = queueVO?.patSrc
+ formData.value.patMobile = queueVO?.patMobile
+ formData.value.patPhone = queueVO?.patPhone
+ formData.value.patWardDesc = queueVO?.patWardDesc
+ formData.value.patBedNo = queueVO?.patBedNo
+ formData.value.medicalCard = queueVO?.medicalCard
+ formData.value.outpatientNo = queueVO?.outpatientNo
+ // 闇�姹�1锛氬尰鍢卞彿锛堟鍓� 3 涓潰鏉块兘閬楁紡浜嗚瀛楁鐨勮祴鍊硷紝瀵艰嚧 PatientInfoBlock 鎭掓樉绀� '-'锛�
+ formData.value.doctorAdviceNo = queueVO?.doctorAdviceNo
+ formData.value.patIdentityId = queueVO?.patIdentityId
+ getFreeRentInfo(formData.value) // 寰呮鏌ョ殑淇℃伅 @ dev_rent 琛�
copyBarcode()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -357,10 +424,11 @@
devInfo.value.state = data.devState
}
-const printBill = async (patId: string, checkType: number, printMode?: number) => {
+const printBill = async (appointmentId: number | null | undefined, printMode?: number) => {
+ if ( appointmentId == null )
+ return
- const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
- console.info( curAppointment )
+ const curAppointment: AppointmentVO = await AppointmentApi.getAppointment( appointmentId )
// 寮曞叆鍚庝娇鐢ㄧず渚�
hiprint.init({
@@ -373,7 +441,7 @@
//var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); 瀵艰嚧璧颁笁椤�
var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//鏂囨湰
- const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType)
+ const checkTypeName = getCheckTypeName(curAppointment.bookCheckType)
panel.addPrintText({ options: { width: 140, height: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const patientBaisc = curAppointment.patName + " " + calGender(curAppointment.patGender) + " " + calculateAge(curAppointment.patBirthday) + "宀�"
panel.addPrintText({ options: { width: 140, height: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
@@ -387,8 +455,8 @@
panel.addPrintText({ options: { width: 140, height: 22, top: 86, left: 20, title: curAppointment.episodeId, textType: 'barcode' } });
//鎵撳嵃
- if (undefined === printMode)
- hiprintTemplate.print2([{},{},{}]); // 鍙互浼� [瀹氫綅鍙傛暟] http://https://ccsimple.github.io/sv-print-docs/config/template.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E8%AE%BE%E8%AE%A1%E4%BD%BF%E7%94%A8%E7%A4%BA%E4%BE%8B
+ if (printMode == null)
+ hiprintTemplate.print2([{},{},{}]); // 棰勮鏂瑰紡 鍙互浼� [瀹氫綅鍙傛暟] http://https://ccsimple.github.io/sv-print-docs/config/template.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E8%AE%BE%E8%AE%A1%E4%BD%BF%E7%94%A8%E7%A4%BA%E4%BE%8B
else
hiprintTemplate.print([{},{},{}]);
}
@@ -444,41 +512,59 @@
}
const feeConfirm = async () => {
- if (formData.value?.id === undefined) {
- message.error(t('璇峰厛棰嗙敤'))
+ if (formData.value.id == null) {
+ message.error('璇峰厛棰嗙敤')
return
}
- const result = await DevRentApi.feeConfirm(formData.value.id)
- if (0 == result)
- message.success(t('纭垂鎿嶄綔鎴愬姛'))
+ try {
+ const result = await DevRentApi.feeConfirm(formData.value.id)
+ if (0 === result) {
+ //message.success('纭垂鎿嶄綔鎴愬姛')
+ }
+ } catch (err) {
+ // 妗嗘灦 浼氱粰鍑� 鍚庡彴鐨� 閿欒淇℃伅
+ }
}
const feeCancel = async () => {
- if (formData.value?.id === undefined) {
- message.error(t('璇峰厛棰嗙敤'))
+ if (formData.value.id == null) {
+ message.error('璇峰厛棰嗙敤')
return
}
- const result = await DevRentApi.feeCancel(formData.value.id)
- if (0 == result)
- message.success(t('鎿嶄綔鎴愬姛'))
+ try {
+ const result = await DevRentApi.feeCancel(formData.value.id)
+ if (0 === result) {
+ //message.success('纭垂鍙栨秷鎴愬姛')
+ }
+ } catch (err) {
+ // 妗嗘灦 浼氱粰鍑� 鍚庡彴鐨� 閿欒淇℃伅
+ }
}
+/**
+ * 鑾峰彇鏉″舰鐮侊紝鏄剧ず涓庡惁 鍚屼竴涓��
+ */
const getDisplayBarcode = (): string => {
- if (!formData.value.checkType)
+ if (formData.value.checkType == null)
return ""
- const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
- if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
- !displayBarcode.includes( formData.value.patDetails.source ))
+ if (formData.value.patDetails?.source == null)
+ return ""
+
+ const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType)
+ if (displayBarcode == null || displayBarcode.length === 0)
+ return ""
+
+ if (!displayBarcode.includes( formData.value.patDetails.source ))
return ""
return getBarcode()
}
const getBarcode = (): string => {
- if (!formData.value.checkType)
+ if (formData.value.checkType == null)
return ""
const patSource = formData.value.patDetails?.source
@@ -495,7 +581,12 @@
const copyBarcode = async () => {
displayBarCode.value = getDisplayBarcode()
- await navigator.clipboard.writeText( getBarcode() );
+
+ const barCode = getBarcode()
+ if (isStringEmpty(barCode))
+ return
+
+ await navigator.clipboard.writeText( barCode );
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3