Jelajahi Sumber

增加过滤

chenjun 1 bulan lalu
induk
melakukan
866650df1a

+ 2 - 1
src/components/BedCardComponent/index.vue

@@ -387,6 +387,7 @@ const updatePatientData = (data: any) => {
   qrCodeContent.value =
     'https://callback.ynims.com/qrcode/elderlyId?=' + data.qr?.eId + '&tenantId=' + data.qr?.tId
   Object.assign(patientData, data)
+  console.log("收到数据:",data)
   try {
     bedList.value = patientData.bedName.toString().split('-')
     //console.log(bedList.value)
@@ -532,7 +533,7 @@ defineExpose({
 }
 
 .info-table .row-care {
-  height: 70px;
+  height: 50px;
 }
 
 .info-table .row-medical {

+ 1 - 1
src/components/BedCardModal/index.vue

@@ -114,7 +114,7 @@ const updatePatientData = async (data) => {
       roomName: sourceData.roomName,
       bedName: sourceData.bedName,
       elderName: sourceData.elderName || '--',
-      elderSex: sourceData.elderSex?.toString() === '1' ? '男' : '女',
+      elderSex: sourceData.elderSex,
       birthday: sourceData.birthday ? formatDate(sourceData.birthday, 'YYYY-MM-DD') : '--',
       checkInTime: sourceData.checkInTime ? formatTime(sourceData.checkInTime, 'yyyy-MM-DD') : '--',
       careLevel: sourceData.nurseLevelName || sourceData.careLevel || '--',

+ 9 - 3
src/utils/outBedCard.ts

@@ -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)