From 1051ab47ac671486801296ccf0ad7c0ed527d7e6 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期二, 22 四月 2025 15:23:19 +0800
Subject: [PATCH] gx优化播报延时

---
 src/stores/sockteInfo.ts |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/stores/sockteInfo.ts b/src/stores/sockteInfo.ts
index 973b618..c3ae235 100644
--- a/src/stores/sockteInfo.ts
+++ b/src/stores/sockteInfo.ts
@@ -1,4 +1,5 @@
 import { defineStore } from 'pinia'
+import { patientInfoStore } from './patient';
 import { ref } from 'vue'
 import { Session } from '@/utils/storage'
 import { boolean, string } from 'yargs'
@@ -74,14 +75,39 @@
      * @param infoObj 体重结果
      */
     function setweightSockte(infoObj:info){
-        if(Number(infoObj.result)>10||Number(infoObj.result)===0){
-            weightSockte.value.deviceName=infoObj.deviceName
-            weightSockte.value.result=infoObj.result
-            weightSockte.value.resultTime=infoObj.resultTime
-            weightSockte.value.state=infoObj.state
-        }else{
-            console.log('体重不足10kg')
-        }
+        console.log('更新体重秤看看有没有患者信息')
+       const patientInfo = patientInfoStore();
+       // 当患者信息有名字 ,还有体重值,我就放弃体重赋值
+       if(patientInfo.patientInfo.name!==''&&weightSockte.value.result!=='0'){
+             console.log('当患者信息有名字 ,还有体重值,我就放弃体重赋值')
+            return true
+       }
+       // 当患者信息没有 ,体重有值的时候
+       else if(patientInfo.patientInfo.name===''&&weightSockte.value.result!=='0'){
+            console.log('当患者信息没有 ,体重有值的时候')
+            console.log(patientInfo.patientInfo.name,weightSockte.value.result);
+            if(Number(infoObj.result)>10||Number(infoObj.result)===0){
+                weightSockte.value.deviceName=infoObj.deviceName
+                weightSockte.value.result=infoObj.result
+                weightSockte.value.resultTime=infoObj.resultTime
+                weightSockte.value.state=infoObj.state
+            }else{
+                console.log('体重不足10kg')
+            }
+       }
+       else{
+        console.log('直接赋值')
+            console.log(patientInfo.patientInfo.name,weightSockte.value.result);
+            if(Number(infoObj.result)>10||Number(infoObj.result)===0){
+                weightSockte.value.deviceName=infoObj.deviceName
+                weightSockte.value.result=infoObj.result
+                weightSockte.value.resultTime=infoObj.resultTime
+                weightSockte.value.state=infoObj.state
+            }else{
+                console.log('体重不足10kg')
+            }
+       }
+       
        
     }
      /**

--
Gitblit v1.8.0