diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/FlagService.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/FlagService.java index 88adf27..503f526 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/FlagService.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/FlagService.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; public interface FlagService { - List getFlags(MongoTemplate template); + Map getFlags(MongoTemplate template); Map getFlag(MongoTemplate template); diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java index 67db698..28fd904 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java @@ -46,7 +46,7 @@ public class AIMedicineServiceImpl implements AIMedicineService { Query query = new Query(); query.limit(1); query.with(Sort.by(Sort.Order.desc("Time"))); - List aiMedicines = template.find(query, Map.class, "AIMedicineTable"); + List aiMedicines = template.find(query, Map.class, "aimedicinetable"); return aiMedicines; } diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java index 9e78877..659507d 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java @@ -33,7 +33,7 @@ public class DoctorMedicineServiceImpl implements DoctorMedicineService { Query query = new Query(); query.limit(1); query.with(Sort.by(Sort.Order.desc("Time"))); - List doctorMedicineTable = template.find(query, Map.class, "DoctorMedicineTable"); + List doctorMedicineTable = template.find(query, Map.class, "doctormedicinetable"); return doctorMedicineTable; } diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java index a7c5f10..1bd3694 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/FlagServiceImpl.java @@ -33,12 +33,18 @@ public class FlagServiceImpl implements FlagService { * @return */ @Override - public List getFlags(MongoTemplate template) { + public Map getFlags(MongoTemplate template) { + Map flagMap = new HashMap(); Query query = new Query(); query.limit(1); query.with(Sort.by(Sort.Order.desc("_id"))); - List flagTable = template.find(query, Map.class, "FlagTable"); - return flagTable; + List linkTable = template.find(query, Map.class, "linktable"); + flagMap.put("linktable", linkTable); + List aiFlagTable = template.find(query, Map.class, "aiflagtable"); + flagMap.put("aiflagtable", aiFlagTable); + List endFlagTable = template.find(query, Map.class, "endflagtable"); + flagMap.put("endflagtable", endFlagTable); + return flagMap; } /** diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java index e498b62..186e3bc 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java @@ -32,7 +32,7 @@ public class RevulsionServiceImpl implements RevulsionService { Query query = new Query(); query.limit(1); query.with(Sort.by(Sort.Order.desc("Time"))); - List revulsionTable = template.find(query, Map.class, "RevulsionTable"); + List revulsionTable = template.find(query, Map.class, "revulsiontable"); return revulsionTable; } diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/VitalSignServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/VitalSignServiceImpl.java index ee671e9..cb513cb 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/VitalSignServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/VitalSignServiceImpl.java @@ -39,21 +39,21 @@ public class VitalSignServiceImpl implements VitalSignsService { Query query = new Query(); query.limit(1); query.with(Sort.by(Sort.Order.desc("Time"))); - List vitalList = template.find(query, Map.class, "featureTable"); + List vitalList = template.find(query, Map.class, "featuretable"); if (vitalList != null && vitalList.size() > 0) { Map map = vitalList.get(0); - Long bis = (Long) map.get("BIS"); + Double bis = (Double) map.get("BIS"); map.put("BIS_except", bis <= 40 || bis >= 60); - Long hr = (Long) map.get("HR"); + Double hr = (Double) map.get("HR"); map.put("HR_except", hr <= 50 || hr >= 80); - Long sbp = (Long) map.get("SBP"); + Double sbp = (Double) map.get("SBP"); map.put("SBP_except", sbp <= 90 || sbp >= 120); - Long dbp = (Long) map.get("DBP"); + Double dbp = (Double) map.get("DBP"); map.put("DBP_except", dbp <= 60 || dbp >= 90); - Float st = (Float) map.get("ST"); + Double st = (Double) map.get("ST"); map.put("ST_except", st <= -0.2 || st >= 0.2); - Long etCO2 = (Long) map.get("EtCO2"); + Double etCO2 = (Double) map.get("EtCO2"); map.put("EtCO2_except", etCO2 <= 30 || etCO2 >= 45); } return vitalList; diff --git a/vital-signs/src/main/java/com/rax/vital/timer/VitalSignTimer.java b/vital-signs/src/main/java/com/rax/vital/timer/VitalSignTimer.java index 8f38ee4..09b8a99 100644 --- a/vital-signs/src/main/java/com/rax/vital/timer/VitalSignTimer.java +++ b/vital-signs/src/main/java/com/rax/vital/timer/VitalSignTimer.java @@ -133,7 +133,7 @@ public class VitalSignTimer { result.put("docMedicineList", docMedicineList); List revulsionList = revulsionService.getRevulsionServiceList(template); result.put("revulsionList", revulsionList); - List flags = flagService.getFlags(template); + Map flags = flagService.getFlags(template); result.put("flags", flags); simpMessagingTemplate.convertAndSendToUser(username + ":" + database, "/surgeryData", result); @@ -292,7 +292,7 @@ public class VitalSignTimer { jsonObject.put("docMedicineList", docMedicineList); List revulsionList = revulsionService.getRevulsionServiceList(template); jsonObject.put("revulsionList", revulsionList); - List flags = flagService.getFlags(template); + Map flags = flagService.getFlags(template); jsonObject.put("flags", flags); WebSocketMessage message = new TextMessage(jsonObject.toJSONString().getBytes());