From 8d42fd0eaeaf86074029603e5726bab6a4641e51 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 25 七月 2025 15:07:32 +0800
Subject: [PATCH] Merge branch 'test' of http://dh.leon056.com:7499/r/data2/Single_application into test
---
src/store/type/bedsideAuxiliaryScreen.type.ts | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index a5526ef..846ae1b 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -1,4 +1,4 @@
-import { tryConvertToInt } from "@/utils/utils";
+import { tryConvertToInt, deepClone } from "@/utils/utils";
import cache from "@/utils/cache";
export interface IotInfo {
属性历史列表: any[];
@@ -172,6 +172,13 @@
倒计时: Countdown | null;
推送类型: PushType;
透析状态: DialysisStatus | null;
+ 床旁血压结果?: any;
+}
+
+export interface Sphygmomanometer {
+ sbp: number | null; // 高压
+ dbp: number | null; // 低压
+ pulseRate: number | null; // 心率
}
export interface BedsideAuxiliaryScreen {
@@ -191,7 +198,16 @@
notSignedIn: NotSignedIn;
signedIn: SignedIn;
underTreatment: UnderTreatment;
+ sphygmomanometer: Sphygmomanometer;
}
+
+export const defaultSphygmomanometer = () :Sphygmomanometer => {
+ return {
+ sbp: null,
+ dbp: null,
+ pulseRate: null,
+ }
+}
export enum EPageType {
NOT_INIT = 0, // 未初始化(没有设备编号)
@@ -402,14 +418,17 @@
notSignedIn: defalutNotSignedIn(), // 未签到时需要的数据
signedIn: defaultSignedIn(), // 已签到时需要的数据
underTreatment: defaultUnderTreatment(), // 治疗中需要的数据
+ sphygmomanometer: defaultSphygmomanometer(), // 血压计传过来的数据
};
};
export const formatDeviceData = (
+ data: BedsideAuxiliaryScreen,
seeMsg: SseMsgData
): BedsideAuxiliaryScreen => {
- const result = defaultDeviceData();
+ const result = deepClone(data);
+
// 默认床号（设备号）
result.devicdeNo = seeMsg.IOT信息?.床号;
@@ -417,6 +436,14 @@
if (seeMsg.推送类型 === EPushType.SPHYGMOMANOMETR) {
result.pageType = EPageType.SPHYGMOMANOMETER;
+
+ const sphygmomanometer = defaultSphygmomanometer();
+ sphygmomanometer.sbp = seeMsg?.床旁血压结果?.sbp;
+ sphygmomanometer.pulseRate = seeMsg?.床旁血压结果?.pulseRate;
+ sphygmomanometer.dbp = seeMsg?.床旁血压结果?.dbp;
+
+ result.sphygmomanometer = sphygmomanometer;
+
} else if (seeMsg.推送类型 === EPushType.CENTRAL_MONITORING) {
// 判断是否存在透析状态，如果不存在就是没有排班
if (seeMsg.透析状态 === null || !seeMsg.透析状态) {
--
Gitblit v1.8.0