diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue index 19229ff8..f4942c64 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue @@ -883,7 +883,7 @@ const initData = async () => { formData.visitNo = props.patientInfo.busNo || '' formData.patientId = props.patientInfo.patientId || '' formData.patientName = props.patientInfo.patientName || '' - formData.medicalrecordNumber = props.patientInfo.identifierNo || '' + formData.medicalrecordNumber = props.patientInfo.visitNo || props.patientInfo.busNo || '' formData.applyDepartment = props.patientInfo.organizationName || '' formData.applyDocName = userNickName.value || userName.value || '' formData.applyDocCode = userId.value || '' @@ -895,6 +895,8 @@ const initData = async () => { // 申请单号在保存时由后端生成,此处显示"自动生成" formData.applyNo = '自动生成' + // 执行时间默认填充当前系统时间 + formData.executeTime = formatDateTime(new Date()) // 申请日期实时更新(启动定时器) startApplyTimeTimer() @@ -1523,7 +1525,7 @@ const resetForm = async () => { applicationId: null, applyOrganizationId: props.patientInfo.orgId || '', patientName: props.patientInfo.patientName || '', - medicalrecordNumber: props.patientInfo.identifierNo || '', + medicalrecordNumber: props.patientInfo.visitNo || props.patientInfo.busNo || '', natureofCost: 'self', applyTime: '', // 申请日期由定时器实时更新 applyDepartment: props.patientInfo.organizationName || '', @@ -1547,7 +1549,7 @@ const resetForm = async () => { visitNo: '', specimenName: '血液', encounterId: props.patientInfo.encounterId || '', - executeTime: null, + executeTime: formatDateTime(new Date()), applicationType: 0, }) selectedInspectionItems.value = [] @@ -1597,7 +1599,7 @@ const handleSave = () => { // 修复【#406】:保存前尝试从 props 同步患者信息,避免因加载时序导致信息缺失 if ((!formData.patientName?.trim() || !formData.medicalrecordNumber?.trim()) && props.patientInfo && props.patientInfo.encounterId) { formData.patientName = props.patientInfo.patientName || '' - formData.medicalrecordNumber = props.patientInfo.identifierNo || '' + formData.medicalrecordNumber = props.patientInfo.visitNo || props.patientInfo.busNo || '' formData.encounterId = props.patientInfo.encounterId || '' formData.visitNo = props.patientInfo.busNo || '' formData.patientId = props.patientInfo.patientId || '' @@ -1997,7 +1999,7 @@ const loadApplicationToForm = async (row) => { // Bug #387修复: 套餐项目默认展开,并自动加载明细 selectedInspectionItems.value = detail.labApplyItemList.map(item => { const itemId = item.activityId || item.itemId || item.id || Math.random().toString(36).substring(2, 11) - const isPackage = item.feePackageId != null || item.itemName?.includes('套餐') + const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName return { itemId: itemId,