renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正今日应急的单位部门数据

Browse Source
This commit is contained in:
wanghao
2025-09-25 17:32:24 +08:00
parent 9d68bcd2ff
commit eba9ee928f
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+16 -2
View File
@@ -805,16 +805,30 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
if (watchListResult != null) { if (watchListResult != null) {
List<WatchMonitorDataVo> watchList = watchListResult.getRecords(); List<WatchMonitorDataVo> watchList = watchListResult.getRecords();
if (watchList != null && !watchList.isEmpty()) { 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) { for (WatchMonitorDataVo watch : watchList) {
TodayEmergencyVO vo = new TodayEmergencyVO(); 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.setUserId(watch.getUserId());
vo.setRealName(watch.getRealName()); vo.setRealName(watch.getRealName());
vo.setEmergencyType("3"); vo.setEmergencyType("3");
vo.setSex(watch.getSex()); vo.setSex(watch.getSex());
vo.setAge(watch.getAge()); vo.setAge(watch.getAge());
vo.setPhone(watch.getPhone()); vo.setPhone(watch.getPhone());
vo.setDepartName(watch.getOrgName1());
vo.setOrgName(watch.getOrgName2());
vo.setAddress(watch.getAddress()); vo.setAddress(watch.getAddress());
vo.setLongitude(watch.getLon()); vo.setLongitude(watch.getLon());
vo.setLatitude(watch.getLat()); vo.setLatitude(watch.getLat());