diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java index d5128cc..16b5890 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/LargeScreenImpl.java @@ -204,8 +204,13 @@ public class LargeScreenImpl { } if (type == 1){ - String noticeContent = String.format("[%s] %s (%s-%s)", StrUtil.isEmpty(socket.getQueue()) ? center.getCenterName() : socket.getQueue(), - socket.getRealName(), socket.getOrgName(), socket.getDepartName()); + String departName = socket.getDepartName(); + String departPart = (departName == null || departName.isEmpty()) ? "" : "-" + departName; + String noticeContent = String.format("[%s] %s (%s%s)", + StrUtil.isEmpty(socket.getQueue()) ? center.getCenterName() : socket.getQueue(), + socket.getRealName(), + socket.getOrgName(), + departPart); Map data = new HashMap<>(2); data.put("noticeContent", noticeContent); data.put("mobile", socket.getPhone()); diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java index bfe5f94..f830617 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java @@ -531,7 +531,6 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl {}", JSONObject.toJSONString(monitorManageUserMobile)); - monitorManageUserMobile = "15619990401"; if (StrUtil.isNotEmpty(monitorManageUserMobile)) { String[] mobileArray = monitorManageUserMobile.split(","); for (String mobile : mobileArray) {