From 6f6643752db73b6598cfcfc27e67475335fdd562 Mon Sep 17 00:00:00 2001
From: republicline <1464474399@qq.com>
Date: Fri, 9 Aug 2024 17:29:25 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E7=BB=99=E8=8D=AFjson=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/rax/vital/handler/AddMedicineHandler.java | 4 +++-
 .../java/com/rax/vital/handler/MachineFeedbackHandler.java  | 3 ++-
 .../vital/medicine/service/impl/AIMedicineServiceImpl.java  | 6 +++++-
 .../src/main/java/com/rax/vital/timer/VitalSignTimerWS.java | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/upms/upms-biz/src/main/java/com/rax/vital/handler/AddMedicineHandler.java b/upms/upms-biz/src/main/java/com/rax/vital/handler/AddMedicineHandler.java
index a995e9e..a490bdc 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/handler/AddMedicineHandler.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/handler/AddMedicineHandler.java
@@ -116,10 +116,12 @@ public class AddMedicineHandler implements WebSocketHandler {
 				JSONObject result = new JSONObject();
 				result.put("msgType", "pong");
 				// 当前时间戳
-				result.put("msg", new Date().getTime() - timeStamp);
+				Long diff = new Date().getTime() - timeStamp;
+				result.put("msg", diff);
 				session.sendMessage(new TextMessage(result.toJSONString().getBytes()));
 			}
 
+
 		}
 	}
 
diff --git a/upms/upms-biz/src/main/java/com/rax/vital/handler/MachineFeedbackHandler.java b/upms/upms-biz/src/main/java/com/rax/vital/handler/MachineFeedbackHandler.java
index bc23825..2bf46e5 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/handler/MachineFeedbackHandler.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/handler/MachineFeedbackHandler.java
@@ -116,7 +116,8 @@ public class MachineFeedbackHandler implements WebSocketHandler {
 				JSONObject result = new JSONObject();
 				result.put("msgType", "pong");
 				// 当前时间戳
-				result.put("msg", new Date().getTime() - timeStamp);
+				Long diff = new Date().getTime() - timeStamp;
+				result.put("msg", diff);
 				session.sendMessage(new TextMessage(result.toJSONString().getBytes()));
 			}
 
diff --git a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java
index 6bf4392..f94117e 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java
@@ -1,5 +1,6 @@
 package com.rax.vital.medicine.service.impl;
 
+import cn.hutool.core.collection.ListUtil;
 import com.mongodb.BasicDBObject;
 import com.rax.vital.medicine.service.AIMedicineService;
 import lombok.AllArgsConstructor;
@@ -186,8 +187,11 @@ public class AIMedicineServiceImpl implements AIMedicineService {
 			}
 			aiMedicines.remove(0);
 			aiMedicines.add(medicine);
+			return aiMedicines.get(0);
+		}else {
+			return Map.of();
 		}
-		return aiMedicines.get(0);
+
 	}
 
 	@Override
diff --git a/upms/upms-biz/src/main/java/com/rax/vital/timer/VitalSignTimerWS.java b/upms/upms-biz/src/main/java/com/rax/vital/timer/VitalSignTimerWS.java
index 1243fb6..fa001e3 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/timer/VitalSignTimerWS.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/timer/VitalSignTimerWS.java
@@ -279,7 +279,8 @@ public class VitalSignTimerWS {
 					String sessionId = machineDatabaseSessionMap.get(database);
 					WebSocketSession machineSession = machineSessionMap.get(sessionId);
 					if (machineSession != null) {
-						result.put(medicine, value);
+						result.put("medicine",medicine);
+						result.put("value",value);
 						result.put("flag", flag);
 						result.put("msgType", "addMedicine");
 						machineSession.sendMessage(new TextMessage(result.toJSONString().getBytes()));