diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index fca3b78..64a9e8c 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -269,7 +269,7 @@ public class SmsServiceImpl implements SmsService{ highRiskSmsModel.setModified(new Date()); highRiskService.addHighRiskSmsModel(highRiskSmsModel); - String name = String.valueOf(riskMap.get("id")); + String name = String.valueOf(riskMap.get("name")); List messageContents = amsSmses.get(name); if (CollectionUtils.isNotEmpty(messageContents)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index b10f69f..ef45096 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -758,7 +758,7 @@ public class ApplyOrderFacade { data.put("dueWeek",orderModel.getDueWeek()); data.put("cDueWeek", orderModel.getcDueWeek()); data.put("dueDate", orderModel.getDueDate()); - data.put("rLevel", orderModel.getrLevel()); + data.put("rLevel", getLevel(orderModel.getrLevel())); data.put("rRisk", orderModel.getrRisk()); data.put("score",orderModel.getScore()); data.put("transferredDisease",orderModel.getTransferredDisease()); @@ -914,4 +914,19 @@ public class ApplyOrderFacade { e.printStackTrace(); } } + + private String getLevel(List levels) + { + + String str = ""; + if (CollectionUtils.isNotEmpty(levels)) + { + for (Map map : levels) + { + str+=map.get("name")+";"; + } + } + + return str; + } } \ No newline at end of file