From 0e5850157c1a9f77390988acb61b6b8651a08f0b Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期一, 11 八月 2025 15:57:48 +0800
Subject: [PATCH] Merge branch 'ID1975-副屏自动更新' into test

---
 src/store/type/bedsideAuxiliaryScreen.type.ts |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index 2d73db0..c89012a 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -123,6 +123,7 @@
   最近最大脱水量透析时长: string;
   透析龄: number | null;
   iot_血液流速: number | null;
+  透析液流量: number | null;
 }
 
 export interface VascularAccess {
@@ -175,6 +176,13 @@
   推送类型: PushType;
   透析状态: DialysisStatus | null;
   床旁血压结果?: any;
+  自定义配置项: Customconfiguration;
+  服务端版本号: string;
+  是否需要立即刷新: 0 | 1;
+}
+
+interface Customconfiguration {
+  患者信息是否加密显示: number;
 }
 
 export interface Sphygmomanometer {
@@ -186,6 +194,8 @@
 export interface BedsideAuxiliaryScreen {
   deviceCode: string;
   devicdeNo: string | number;
+  version: string;
+  isRefresh: number;
   recordCode: string;
   patientCode: string;
   patientName: string;
@@ -201,6 +211,7 @@
   signedIn: SignedIn;
   underTreatment: UnderTreatment;
   sphygmomanometer: Sphygmomanometer;
+  customConfiguration: Customconfiguration;
 }
 
 export const defaultSphygmomanometer = () :Sphygmomanometer => {
@@ -413,6 +424,8 @@
   return {
     deviceCode: "", // 设备code
     devicdeNo: "", // 设备号
+    version: "0.0.0", // 版本号
+    isRefresh: 0, // 是否立即刷新
     recordCode: "", // 透析单code
     patientCode: "", // 患者code
     patientName: "", // 患者姓名
@@ -421,6 +434,7 @@
     gender: "", // 性别
     patForm: EPatForm.OUTPATIENT_SERVICE, // 患者来源
     patFormNumber: "", // 住院门诊号
+    customConfiguration: defaultCustomconfiguration(), // 自定义配置项
     // @ts-ignore
     pageType, // 当前要展示的页面
     treatmentStatus: EMedStatus.NOT_CHECKED_IN, // 透析状态
@@ -432,6 +446,12 @@
   };
 };
 
+export const defaultCustomconfiguration = (): Customconfiguration => {
+  return {
+    患者信息是否加密显示: 0
+  }
+}
+
 export const formatDeviceData = (
   data: BedsideAuxiliaryScreen,
   seeMsg: SseMsgData
@@ -439,10 +459,17 @@
 
   const result = deepClone(data);
 
+  // 版本号/是否立即刷新
+  result.version = seeMsg.服务端版本号;
+  result.isRefresh = seeMsg.是否需要立即刷新;
+
 
   // 默认床号(设备号)
   result.devicdeNo = seeMsg.IOT信息?.床号;
   result.deviceCode = seeMsg.IOT信息?.设备唯一编号;
+
+  // 自定义配置项
+  result.customConfiguration = seeMsg.自定义配置项 ?? defaultCustomconfiguration();
 
   if (seeMsg.推送类型 === EPushType.SPHYGMOMANOMETR) {
     result.pageType = EPageType.SPHYGMOMANOMETER;
@@ -570,7 +597,7 @@
         // underTreatment.bloodFlow = seeMsg.透析状态?.iot_血流量 ?? null;
         underTreatment.bloodFlow = seeMsg.透析状态?.iot_血液流速 ?? null;
         underTreatment.dialysisFluidFlowRate =
-          seeMsg.透析状态?.iot_血流量 ?? null;
+          seeMsg.透析状态?.透析液流量 ?? null;
         underTreatment.bloodVolumeMonitoring =  null;
         underTreatment.ktvList =
           seeMsg.透析状态?.实时ktv计算结果列表

--
Gitblit v1.8.0