From c2583add1b2d8658821e9ef192456a892aff7fe4 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期六, 09 八月 2025 17:44:44 +0800
Subject: [PATCH] Merge branch 'master' of http://dh.leon056.com:7499/r/data2/Single_application into ID1918-患者姓名脱敏

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

diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index 2d73db0..a4193f6 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,11 @@
   推送类型: PushType;
   透析状态: DialysisStatus | null;
   床旁血压结果?: any;
+  自定义配置项: Customconfiguration;
+}
+
+interface Customconfiguration {
+  患者信息是否加密显示: number;
 }
 
 export interface Sphygmomanometer {
@@ -201,6 +207,7 @@
   signedIn: SignedIn;
   underTreatment: UnderTreatment;
   sphygmomanometer: Sphygmomanometer;
+  customConfiguration: Customconfiguration;
 }
 
 export const defaultSphygmomanometer = () :Sphygmomanometer => {
@@ -421,6 +428,7 @@
     gender: "", // 性别
     patForm: EPatForm.OUTPATIENT_SERVICE, // 患者来源
     patFormNumber: "", // 住院门诊号
+    customConfiguration: defaultCustomconfiguration(), // 自定义配置项
     // @ts-ignore
     pageType, // 当前要展示的页面
     treatmentStatus: EMedStatus.NOT_CHECKED_IN, // 透析状态
@@ -431,6 +439,12 @@
     sphygmomanometer: defaultSphygmomanometer(), // 血压计传过来的数据
   };
 };
+
+export const defaultCustomconfiguration = (): Customconfiguration => {
+  return {
+    患者信息是否加密显示: 0
+  }
+}
 
 export const formatDeviceData = (
   data: BedsideAuxiliaryScreen,
@@ -443,6 +457,9 @@
   // 默认床号(设备号)
   result.devicdeNo = seeMsg.IOT信息?.床号;
   result.deviceCode = seeMsg.IOT信息?.设备唯一编号;
+
+  // 自定义配置项
+  result.customConfiguration = seeMsg.自定义配置项 ?? defaultCustomconfiguration();
 
   if (seeMsg.推送类型 === EPushType.SPHYGMOMANOMETR) {
     result.pageType = EPageType.SPHYGMOMANOMETER;
@@ -570,7 +587,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