From a8d4b89aca93b9539e823e5a27c90220bbdcefd1 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期三, 06 八月 2025 15:30:34 +0800
Subject: [PATCH] Merge branch 'ID1968-血压echarts图修改' into test
---
src/store/type/bedsideAuxiliaryScreen.type.ts | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index 71434b1..a4193f6 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -176,6 +176,11 @@
推送类型: PushType;
透析状态: DialysisStatus | null;
床旁血压结果?: any;
+ 自定义配置项: Customconfiguration;
+}
+
+interface Customconfiguration {
+ 患者信息是否加密显示: number;
}
export interface Sphygmomanometer {
@@ -202,6 +207,7 @@
signedIn: SignedIn;
underTreatment: UnderTreatment;
sphygmomanometer: Sphygmomanometer;
+ customConfiguration: Customconfiguration;
}
export const defaultSphygmomanometer = () :Sphygmomanometer => {
@@ -361,6 +367,8 @@
dialysisFluidFlowRate: number | null; // 透析液流量
ktvList: KtvItem[]; // 实时ktv计算结果列表
dialysisAge: number | null, // 透析龄
+ venousPressure2: number | null; // 静脉压
+ transmembranePressure2: number | null; // 跨膜压
}
export interface MonitoringRecord {
@@ -400,6 +408,8 @@
ktvList: [],
prescriptionDialysisDuration: null, // 透析处方的时长（单位：小时）
dialysisAge: null,
+ venousPressure2: null, // 静脉压
+ transmembranePressure2: null, // 跨膜压
};
};
@@ -418,6 +428,7 @@
gender: "", // 性别
patForm: EPatForm.OUTPATIENT_SERVICE, // 患者来源
patFormNumber: "", // 住院门诊号
+ customConfiguration: defaultCustomconfiguration(), // 自定义配置项
// @ts-ignore
pageType, // 当前要展示的页面
treatmentStatus: EMedStatus.NOT_CHECKED_IN, // 透析状态
@@ -428,6 +439,12 @@
sphygmomanometer: defaultSphygmomanometer(), // 血压计传过来的数据
};
};
+
+export const defaultCustomconfiguration = (): Customconfiguration => {
+ return {
+ 患者信息是否加密显示: 0
+ }
+}
export const formatDeviceData = (
data: BedsideAuxiliaryScreen,
@@ -440,6 +457,9 @@
// 默认床号（设备号）
result.devicdeNo = seeMsg.IOT信息?.床号;
result.deviceCode = seeMsg.IOT信息?.设备唯一编号;
+
+ // 自定义配置项
+ result.customConfiguration = seeMsg.自定义配置项 ?? defaultCustomconfiguration();
if (seeMsg.推送类型 === EPushType.SPHYGMOMANOMETR) {
result.pageType = EPageType.SPHYGMOMANOMETER;
@@ -558,9 +578,9 @@
underTreatment.venousPressure = null;
underTreatment.transmembranePressure = null;
}
- // underTreatment.venousPressure = seeMsg.透析状态?.iot_静脉压 ?? null;
- // underTreatment.transmembranePressure =
- // seeMsg.透析状态?.iot_跨膜压 ?? null;
+ underTreatment.venousPressure2 = seeMsg.透析状态?.iot_静脉压 ?? null;
+ underTreatment.transmembranePressure2 =
+ seeMsg.透析状态?.iot_跨膜压 ?? null;
underTreatment.ktv = seeMsg.透析状态?.实时ktv ?? "";
underTreatment.monitoringRecord = seeMsg.透析状态?.监测记录列表 ?? [];
underTreatment.doctorAdvice = seeMsg.透析状态?.透析单医嘱列表 ?? [];
--
Gitblit v1.8.0