Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
wangjian963
2026-06-03 16:47:45 +08:00
3 changed files with 6 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div class="medical-form">
<div class="patient-name">
患者姓名{{ patient?.patientName || '未知' }} &nbsp;&nbsp; 病历号{{
@@ -294,7 +294,7 @@ onMounted(() => {
formData.department = patient?.inHospitalOrgName || '';
}
if (!formData.bedNo) {
formData.bedNo = patient?.houseName + '-' + patient?.bedName;
formData.bedNo = (patient?.houseName && patient?.bedName ? patient.houseName + '-' + patient.bedName : '');
}
if (!formData.busNo) {
formData.busNo = patient?.busNo || '';

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div class="medical-document">
<!-- 标题区域 -->
<div class="doc-header">
@@ -591,7 +591,7 @@ onMounted(() => {
formData.department = patient?.inHospitalOrgName || '';
}
if (!formData.bedNo) {
formData.bedNo = patient?.houseName + '-' + patient?.bedName;
formData.bedNo = (patient?.houseName && patient?.bedName ? patient.houseName + '-' + patient.bedName : '');
}
if (!formData.busNo) {
formData.busNo = patient?.busNo || '';

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div class="medical-document">
<!-- 标题区域 -->
<div class="doc-header">
@@ -404,7 +404,7 @@ onMounted(() => {
formData.department = patient?.inHospitalOrgName || '';
}
if (!formData.bedNo) {
formData.bedNo = patient?.houseName + '-' + patient?.bedName;
formData.bedNo = (patient?.houseName && patient?.bedName ? patient.houseName + '-' + patient.bedName : '');
}
});
const patient = props.patientInfo;