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 16b5890..47c3e6a 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 @@ -249,22 +249,22 @@ public class LargeScreenImpl { } this.setDepartmentInfo(socket, sysUser.getOrgCode()); // 获取所有资源 - List allList = tblAmbulanceGpsService.getAllList(String.valueOf(center.getLatitude()), String.valueOf(center.getLongitude()), null, null); +// List allList = tblAmbulanceGpsService.getAllList(String.valueOf(center.getLatitude()), String.valueOf(center.getLongitude()), null, null); socket.setLon(longitude); socket.setLat(latitude); - List hospitalSocketVoList = new ArrayList<>(); - if (CollUtil.isNotEmpty(allList)) { - List threeNearestHospitals = findThreeNearestHospitals(allList, socket.getLon(), socket.getLat()); - threeNearestHospitals.forEach(item -> { - TblBaseHospitalVo hospitalSocketVo = new TblBaseHospitalVo(); - hospitalSocketVo.setName(item.getName()); - hospitalSocketVo.setLon(item.getLon()); - hospitalSocketVo.setLat(item.getLat()); - hospitalSocketVo.setDistance(item.getDistance()); - hospitalSocketVoList.add(hospitalSocketVo); - }); - } - socket.setHospitalList(hospitalSocketVoList); +// List hospitalSocketVoList = new ArrayList<>(); +// if (CollUtil.isNotEmpty(allList)) { +// List threeNearestHospitals = findThreeNearestHospitals(allList, socket.getLon(), socket.getLat()); +// threeNearestHospitals.forEach(item -> { +// TblBaseHospitalVo hospitalSocketVo = new TblBaseHospitalVo(); +// hospitalSocketVo.setName(item.getName()); +// hospitalSocketVo.setLon(item.getLon()); +// hospitalSocketVo.setLat(item.getLat()); +// hospitalSocketVo.setDistance(item.getDistance()); +// hospitalSocketVoList.add(hospitalSocketVo); +// }); +// } +// socket.setHospitalList(hospitalSocketVoList); } private void setQimoPushMsg(EmergencySocket socket, LoginUserNew sysUser, TblUserHelp userHelp) { 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 e9c5906..949cc47 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 @@ -248,8 +248,8 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl hospitalSocketVoList = getNearestHospitals(data); - socketVo.setHospitalList(hospitalSocketVoList); +// List hospitalSocketVoList = getNearestHospitals(data); +// socketVo.setHospitalList(hospitalSocketVoList); // 20250427 新增需求 非当日数据 不推 if (!DateUtil.isSameDay(DateUtil.beginOfDay(new Date()), socketVo.getWarnTime())) {