短信bug修复

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(),
+                        String departName = socket.getDepartName();
-                                socket.getRealName(), socket.getOrgName(), 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<String, String> data = new HashMap<>(2);
                         data.put("noticeContent", noticeContent);
                         data.put("mobile", socket.getPhone());

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java

@@ -531,7 +531,6 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
      */
     public void sendSms(WatchMonitorData monitorDataEntity, WatchMonitorSocketVo socketVo, String monitorManageUserMobile) {
         log.info("开始发送短信 号码：=> {}", JSONObject.toJSONString(monitorManageUserMobile));
-        monitorManageUserMobile = "15619990401";
         if (StrUtil.isNotEmpty(monitorManageUserMobile)) {
             String[] mobileArray = monitorManageUserMobile.split(",");
             for (String mobile : mobileArray) {