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 |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index 20b3abf..a4193f6 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -1,5 +1,5 @@
 import { tryConvertToInt, deepClone } from "@/utils/utils";
-import cache from "@/utils/cache";
+import { Local } from "@/utils/storage";
 export interface IotInfo {
   属性历史列表: any[];
   床号: string;
@@ -121,6 +121,9 @@
   透析结束时间: number | null;
   透析处方备注: string;
   最近最大脱水量透析时长: string;
+  透析龄: number | null;
+  iot_血液流速: number | null;
+  透析液流量: number | null;
 }
 
 export interface VascularAccess {
@@ -173,6 +176,11 @@
   推送类型: PushType;
   透析状态: DialysisStatus | null;
   床旁血压结果?: any;
+  自定义配置项: Customconfiguration;
+}
+
+interface Customconfiguration {
+  患者信息是否加密显示: number;
 }
 
 export interface Sphygmomanometer {
@@ -199,6 +207,7 @@
   signedIn: SignedIn;
   underTreatment: UnderTreatment;
   sphygmomanometer: Sphygmomanometer;
+  customConfiguration: Customconfiguration;
 }
 
 export const defaultSphygmomanometer = () :Sphygmomanometer => {
@@ -307,6 +316,7 @@
   weightAfterLastDialysis: number | null; // 上次透后称重
   weightIncrease: number | null; // 体重增加
   weightIncreaseRate: number | null; // 体重增长率
+  maximumDehydrationDuration: string;
 }
 
 export const defaultSignedIn = (): SignedIn => {
@@ -323,6 +333,7 @@
     weightAfterLastDialysis: null, // 上次透后称重
     weightIncrease: null, // 体重增加
     weightIncreaseRate: null, // 体重增长率
+    maximumDehydrationDuration: '',
   };
 };
 
@@ -355,6 +366,9 @@
   bloodVolumeMonitoring: number | null; // 血容量监测
   dialysisFluidFlowRate: number | null; // 透析液流量
   ktvList: KtvItem[]; // 实时ktv计算结果列表
+  dialysisAge: number | null, // 透析龄
+  venousPressure2: number | null; // 静脉压
+  transmembranePressure2: number | null; // 跨膜压
 }
 
 export interface MonitoringRecord {
@@ -393,11 +407,14 @@
     dialysisFluidFlowRate: null,
     ktvList: [],
     prescriptionDialysisDuration: null, // 透析处方的时长(单位:小时)
+    dialysisAge: null,
+    venousPressure2: null, // 静脉压
+    transmembranePressure2: null, // 跨膜压
   };
 };
 
 export const defaultDeviceData = (): BedsideAuxiliaryScreen => {
-  const pageType = cache.get("devcieCode")
+  const pageType = Local.get("devcieCode")
     ? EPageType.LOADING
     : EPatForm.OUTPATIENT_SERVICE;
   return {
@@ -411,6 +428,7 @@
     gender: "", // 性别
     patForm: EPatForm.OUTPATIENT_SERVICE, // 患者来源
     patFormNumber: "", // 住院门诊号
+    customConfiguration: defaultCustomconfiguration(), // 自定义配置项
     // @ts-ignore
     pageType, // 当前要展示的页面
     treatmentStatus: EMedStatus.NOT_CHECKED_IN, // 透析状态
@@ -421,6 +439,12 @@
     sphygmomanometer: defaultSphygmomanometer(), // 血压计传过来的数据
   };
 };
+
+export const defaultCustomconfiguration = (): Customconfiguration => {
+  return {
+    患者信息是否加密显示: 0
+  }
+}
 
 export const formatDeviceData = (
   data: BedsideAuxiliaryScreen,
@@ -433,6 +457,9 @@
   // 默认床号(设备号)
   result.devicdeNo = seeMsg.IOT信息?.床号;
   result.deviceCode = seeMsg.IOT信息?.设备唯一编号;
+
+  // 自定义配置项
+  result.customConfiguration = seeMsg.自定义配置项 ?? defaultCustomconfiguration();
 
   if (seeMsg.推送类型 === EPushType.SPHYGMOMANOMETR) {
     result.pageType = EPageType.SPHYGMOMANOMETER;
@@ -501,6 +528,8 @@
           seeMsg.透析状态?.上次透后称重 ?? null;
         signedIn.weightIncrease = seeMsg.透析状态?.体重增加 ?? null;
         signedIn.weightIncreaseRate = seeMsg.透析状态?.体重增长率 ?? null;
+        signedIn.maximumDehydrationDuration =
+          seeMsg.透析状态?.最近最大脱水量透析时长 ?? "";
 
         result.signedIn = signedIn;
       }
@@ -540,19 +569,31 @@
           seeMsg.透析状态?.iot_脱水速率 ?? null;
         underTreatment.currentBloodTemperature =
           seeMsg.透析状态?.当前血温 ?? null;
-        underTreatment.venousPressure = seeMsg.透析状态?.iot_静脉压 ?? null;
-        underTreatment.transmembranePressure =
+          // 血压取监测记录的最后一条数据
+          if (seeMsg.透析状态?.监测记录列表 && seeMsg.透析状态?.监测记录列表.length > 0) {
+            const lastItem = seeMsg.透析状态?.监测记录列表[seeMsg.透析状态?.监测记录列表.length -1];
+            underTreatment.venousPressure = lastItem?.伸缩压 ?? null;
+            underTreatment.transmembranePressure = lastItem?.舒张压 ?? null;
+          } else {
+            underTreatment.venousPressure = null;
+            underTreatment.transmembranePressure = null;
+          }
+        underTreatment.venousPressure2 = seeMsg.透析状态?.iot_静脉压 ?? null;
+        underTreatment.transmembranePressure2 =
           seeMsg.透析状态?.iot_跨膜压 ?? null;
         underTreatment.ktv = seeMsg.透析状态?.实时ktv ?? "";
         underTreatment.monitoringRecord = seeMsg.透析状态?.监测记录列表 ?? [];
         underTreatment.doctorAdvice = seeMsg.透析状态?.透析单医嘱列表 ?? [];
-        underTreatment.bloodFlow = seeMsg.透析状态?.iot_血流量 ?? null;
+        // underTreatment.bloodFlow = seeMsg.透析状态?.iot_血流量 ?? null;
+        underTreatment.bloodFlow = seeMsg.透析状态?.iot_血液流速 ?? null;
         underTreatment.dialysisFluidFlowRate =
-          seeMsg.透析状态?.iot_血流量 ?? null;
+          seeMsg.透析状态?.透析液流量 ?? null;
         underTreatment.bloodVolumeMonitoring =  null;
         underTreatment.ktvList =
           seeMsg.透析状态?.实时ktv计算结果列表
             ?.realTimeKtvCalcDetailResultInfo ?? [];
+        underTreatment.dialysisAge = seeMsg.透析状态?.透析龄 ?? null;
+
         result.underTreatment = underTreatment;
       }
     }

--
Gitblit v1.8.0