|
|
@@ -175,10 +175,16 @@ export const getPatientData = (data,dataElder) => {
|
|
|
roomName: '',
|
|
|
bedName: dataForm.value.bedName,
|
|
|
elderName: dataForm.value.elderName,
|
|
|
- elderSex: dataForm.value.elderSex?.toString() == '1' ? '男' : '女',
|
|
|
+ elderSex: dataForm.value.idCard
|
|
|
+ ? (getInfo(dataForm.value.idCard).sex==1?'男':'女')
|
|
|
+ : dataForm.value.elderSex?.toString() == '1'
|
|
|
+ ? '男'
|
|
|
+ : '女',
|
|
|
birthday: formatDate(dataForm.value.birthday, 'YYYY-MM-DD')
|
|
|
? formatDate(dataForm.value.birthday, 'YYYY-MM-DD')
|
|
|
- : dataForm.value.idCard?getInfo(dataForm.value.idCard).birth:'',
|
|
|
+ : dataForm.value.idCard
|
|
|
+ ? getInfo(dataForm.value.idCard).birth
|
|
|
+ : '',
|
|
|
checkInTime: dataForm.value.checkInTime
|
|
|
? formatTime(dataForm.value.checkInTime, 'yyyy-MM-dd')
|
|
|
: '--',
|
|
|
@@ -215,7 +221,7 @@ export const getPatientData = (data,dataElder) => {
|
|
|
flagTexts: parsedFlagData
|
|
|
}
|
|
|
|
|
|
- console.log('床头卡组装后数据:', result)
|
|
|
+ console.log('床头卡组装后数据:::', result)
|
|
|
return result
|
|
|
} catch (error) {
|
|
|
console.error('处理床头卡数据时发生错误:', error)
|