From 50cad200be31339ddb98833da16fe88a3c6e00cb Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期四, 31 七月 2025 16:06:04 +0800
Subject: [PATCH] Merge branch 'master' of http://dh.leon056.com:7499/r/data2/Single_application into ID2716-血流量取值bug
---
src/store/type/bedsideAuxiliaryScreen.type.ts | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index b9ad888..86e2156 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;
@@ -122,6 +122,7 @@
透析处方备注: string;
最近最大脱水量透析时长: string;
透析龄: number | null;
+ iot_血液流速: number | null;
}
export interface VascularAccess {
@@ -402,7 +403,7 @@
};
export const defaultDeviceData = (): BedsideAuxiliaryScreen => {
- const pageType = cache.get("devcieCode")
+ const pageType = Local.get("devcieCode")
? EPageType.LOADING
: EPatForm.OUTPATIENT_SERVICE;
return {
@@ -547,13 +548,23 @@
seeMsg.透析状态?.iot_脱水速率 ?? null;
underTreatment.currentBloodTemperature =
seeMsg.透析状态?.当前血温 ?? null;
- underTreatment.venousPressure = seeMsg.透析状态?.iot_静脉压 ?? null;
- underTreatment.transmembranePressure =
- seeMsg.透析状态?.iot_跨膜压 ?? null;
+ // 血压取监测记录的最后一条数据
+ 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.venousPressure = seeMsg.透析状态?.iot_静脉压 ?? null;
+ // underTreatment.transmembranePressure =
+ // 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;
underTreatment.bloodVolumeMonitoring = null;
--
Gitblit v1.8.0