diff --git a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java
index 6258adb..1a92299 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java
@@ -41,21 +41,27 @@ public class FlagServiceImpl implements FlagService {
 		List<Map> linkTable = template.find(query, Map.class, "linktable");
 		List<Map> aiFlagTable = template.find(query, Map.class, "aiflagtable");
 		List<Map> endFlagTable = template.find(query, Map.class, "endflagtable");
-		if (linkTable != null && linkTable.size() > 0
-				&& aiFlagTable != null && aiFlagTable.size() > 0
-				&& endFlagTable != null && endFlagTable.size() > 0) {
 
+		if (!linkTable.isEmpty()){
 			flagMap.put("linkFlag", linkTable.get(0).get("Flag"));
-			flagMap.put("aiFlag", aiFlagTable.get(0).get("Flag"));
-			flagMap.put("endFlag", endFlagTable.get(0).get("Flag"));
-			return flagMap;
-
-		} else {
+		}else {
 			flagMap.put("linkFlag", "");
-			flagMap.put("aiFlag", "");
-			flagMap.put("endFlag", "");
-			return flagMap;
 		}
+
+		if (!aiFlagTable.isEmpty()){
+			flagMap.put("aiFlag", aiFlagTable.get(0).get("Flag"));
+		}else {
+			flagMap.put("aiFlag", "");
+		}
+
+		if (!endFlagTable.isEmpty()){
+			flagMap.put("endFlag", endFlagTable.get(0).get("Flag"));
+		}else {
+			flagMap.put("endFlag", "");
+		}
+
+		return flagMap;
+
 	}
 
 	/**
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 fa001e3..0db056d 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
@@ -128,7 +128,7 @@ public class VitalSignTimerWS {
 					// 医生给药信息
 					medicineRateMap = doctorMedicineService.getDocMedicine(template);
 				}
-
+				System.out.println("medicineRateMap = " + medicineRateMap);
 				// 写上面会存在线程安全问题
 				ArrayList<MedicineDTO> medicineList = new ArrayList<>();
 				medicineList.add(new MedicineDTO("1", "丙泊酚", "0", "0"));
@@ -166,6 +166,7 @@ public class VitalSignTimerWS {
 
 				jsonObject.put("medicineList", medicineList);
 				jsonObject.put("msgType", "msg");
+				System.out.println("medicineList = " + medicineList);
 				// 如果是人工给药展示人工给药的内容
 				WebSocketMessage message = new TextMessage(jsonObject.toJSONString().getBytes());