diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
index 725b7ef..5fdaa77 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
@@ -805,16 +805,30 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
         if (watchListResult != null) {
             List<WatchMonitorDataVo> watchList = watchListResult.getRecords();
             if (watchList != null && !watchList.isEmpty()) {
+                List<String> userIdList = watchList.stream().map(WatchMonitorDataVo::getUserId).distinct().collect(Collectors.toList());
+                List<LoginUser> loginUsers = sysBaseAPI.listUserByIdsNew(userIdList);
                 for (WatchMonitorDataVo watch : watchList) {
                     TodayEmergencyVO vo = new TodayEmergencyVO();
+                    loginUsers.stream().filter(item->item.getId().equals(watch.getUserId())).findFirst().ifPresent(item->{
+                        if (ObjUtil.isNotEmpty(item.getOrgCode())) {
+                            SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(item.getOrgCode()));
+                            if (secondDepart != null) {
+                                vo.setDepartCode(secondDepart.getOrgCode());
+                                vo.setDepartName(secondDepart.getDepartName());
+                            }
+                            SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(item.getOrgCode()));
+                            if (thirdDepart != null) {
+                                vo.setOrgCode(thirdDepart.getOrgCode());
+                                vo.setOrgName(thirdDepart.getDepartName());
+                            }
+                        }
+                    });
                     vo.setUserId(watch.getUserId());
                     vo.setRealName(watch.getRealName());
                     vo.setEmergencyType("3");
                     vo.setSex(watch.getSex());
                     vo.setAge(watch.getAge());
                     vo.setPhone(watch.getPhone());
-                    vo.setDepartName(watch.getOrgName1());
-                    vo.setOrgName(watch.getOrgName2());
                     vo.setAddress(watch.getAddress());
                     vo.setLongitude(watch.getLon());
                     vo.setLatitude(watch.getLat());