From 4636d11291595bfa443d13d0bd667a976348431d Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 04 二月 2023 10:21:25 +0800
Subject: [PATCH] 34

---
 src/views/home/index.vue |   29 +++++++++++++++--------------
 package.json             |    2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index b54bb3a..3b6a059 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sign-tool",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "icon": "public/favicon.ico",
   "main": "dist/electron/main/index.js",
   "author": "",
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 7f8437a..179e87d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -138,27 +138,28 @@
             () => {
               console.log('患者信息变化',patientInfo.value)
               patientCodeLs=''
+              patientCodeLsXy=''
               console.log(patientCodeLs,'患者codec初始化')
-              if (patientInfo.value.id !== 0&&patientInfo.value.name!==''&&patientInfo.value.isScheduled===1) {
-                  let str=`${patientInfo.value.name}识别成功。`
-                  speech.value?.speak({text:str}).then(()=>{
-                    console.log("播报完成...")
-                  })
-                  sockteStore().setweightSockte({
+              sockteStore().setweightSockte({
                       type: "体重秤",
                       state: 2,
                       deviceName: "",
                       result: "0",
                       resultTime: ""
                   })
-                  sockteStore().setxyjSockte({
-                      type: "血压计",
-                      state: 2,
-                      deviceName: "",
-                      result: "",
-                      resultTime: ""
+              sockteStore().setxyjSockte({
+                  type: "血压计",
+                  state: 2,
+                  deviceName: "",
+                  result: "",
+                  resultTime: ""
+              })
+              settime()
+              if (patientInfo.value.id !== 0&&patientInfo.value.name!==''&&patientInfo.value.isScheduled===1) {
+                  let str=`${patientInfo.value.name}识别成功。`
+                  speech.value?.speak({text:str}).then(()=>{
+                    console.log("播报完成...")
                   })
-                  settime()
 
               }
               // 没有找到患者
@@ -257,7 +258,7 @@
                         }
                         console.log('发送患者结果', mode)
                         if(patientCodeLsXy===mode.patientCode){
-                          speech.value?.speak({text:'不能重复测量血压,请重新失败患者再测量血压'}).then(()=>{
+                          speech.value?.speak({text:'不能重复测量血压,请重新识别患者再测量血压'}).then(()=>{
                             console.log("播报完成...")
                           })
                           console.log('如果是重复提交 就不要上传到api')

--
Gitblit v1.8.0