From 5f67438ad9e315ca94114c7f4b6c85369c621855 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期二, 09 九月 2025 13:00:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dh.leon056.com:7499/r/data2/Single_application into ID1766-添加推送登录功能

---
 src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue |    8 +++++++-
 src/store/type/bedsideAuxiliaryScreen.type.ts                 |    8 +++++++-
 src/store/bedsideAuxiliaryScreen.ts                           |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/store/bedsideAuxiliaryScreen.ts b/src/store/bedsideAuxiliaryScreen.ts
index c2e11a7..de157fa 100644
--- a/src/store/bedsideAuxiliaryScreen.ts
+++ b/src/store/bedsideAuxiliaryScreen.ts
@@ -104,7 +104,7 @@
 
     // 重连控制
     let retryCount = 0;
-    const maxRetryCount = 60;
+    const maxRetryCount = 6000 * 60 * 24 * 30;
     const baseRetryDelay = 1000; // 1秒开始重连延迟
 
     /**
diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index c89012a..000a25d 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -124,6 +124,7 @@
   透析龄: number | null;
   iot_血液流速: number | null;
   透析液流量: number | null;
+  患者出生日期: string;
 }
 
 export interface VascularAccess {
@@ -183,6 +184,7 @@
 
 interface Customconfiguration {
   患者信息是否加密显示: number;
+  是否显示患者出生年月日: number;
 }
 
 export interface Sphygmomanometer {
@@ -212,6 +214,7 @@
   underTreatment: UnderTreatment;
   sphygmomanometer: Sphygmomanometer;
   customConfiguration: Customconfiguration;
+  患者出生日期: string;
 }
 
 export const defaultSphygmomanometer = () :Sphygmomanometer => {
@@ -443,12 +446,14 @@
     signedIn: defaultSignedIn(), // 已签到时需要的数据
     underTreatment: defaultUnderTreatment(), // 治疗中需要的数据
     sphygmomanometer: defaultSphygmomanometer(), // 血压计传过来的数据
+    患者出生日期: '',
   };
 };
 
 export const defaultCustomconfiguration = (): Customconfiguration => {
   return {
-    患者信息是否加密显示: 0
+    患者信息是否加密显示: 0,
+    是否显示患者出生年月日: 0
   }
 }
 
@@ -502,6 +507,7 @@
       result.gender = seeMsg.透析状态?.性别 + "";
       result.patForm = seeMsg.透析状态?.患者来源;
       result.patFormNumber = seeMsg.透析状态?.患者门诊住院号;
+      result.患者出生日期 = seeMsg.透析状态?.患者出生日期;
 
       // 未签到页面需要显示的
       if (treatmentStatus === EMedStatus.NOT_CHECKED_IN) {
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
index 7519610..cb20147 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
@@ -23,7 +23,8 @@
         <!-- 有排班 -->
         <template v-else>
           <span class="info-text">{{ patientInfo.patientName }}</span>
-          <span class="info-text">{{ patientInfo.age }}岁</span>
+          <span v-if="isShowBirthDate" class="info-text">{{ patientInfo.birthDate }}</span>
+          <span v-else class="info-text">{{ patientInfo.age }}岁</span>
           <span class="info-text">{{ patientInfo.gender }}</span>
           <span v-if="patientInfo.patFormNumber" class="info-text">
             {{ patientInfo.patForm }}:{{ patientInfo.patFormNumber }}</span
@@ -142,9 +143,14 @@
           bedsideAuxiliaryScreenStore.deviceData.underTreatment.dialysisAge
         )
       : null,
+    birthDate: bedsideAuxiliaryScreenStore.deviceData.患者出生日期,
   };
 });
 
+const isShowBirthDate = computed(() => {
+  return bedsideAuxiliaryScreenStore.deviceData.customConfiguration.是否显示患者出生年月日 === 1;
+});
+
 const formattedCountdown = computed(() => {
   if (countdown.value == null || countdown.value <= 0) return "0s";
 

--
Gitblit v1.8.0