|
@@ -2724,11 +2724,7 @@ public class ApiController {
|
|
|
public R getPointSignInfo(String longitude, String latitude) {
|
|
|
List<Map<String, Object>> mapList = new ArrayList<>();
|
|
|
|
|
|
- LambdaQueryWrapper<WmDaHospital> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
|
- lambdaQueryWrapper.isNotNull(WmDaHospital::getLatitude);
|
|
|
- lambdaQueryWrapper.eq(WmDaHospital::getDelFlag, "0");
|
|
|
- lambdaQueryWrapper.eq(WmDaHospital::getEnableFlag, "0");
|
|
|
-
|
|
|
+ // 医院
|
|
|
WmDaHospital qWmDaHospital = new WmDaHospital();
|
|
|
qWmDaHospital.setLongitude(longitude);
|
|
|
qWmDaHospital.setLatitude(latitude);
|
|
@@ -2746,6 +2742,7 @@ public class ApiController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 商业公司
|
|
|
WmDaDistribution qwmDaDistribution = new WmDaDistribution();
|
|
|
qwmDaDistribution.setLatitude(latitude);
|
|
|
qwmDaDistribution.setLongitude(longitude);
|
|
@@ -2764,6 +2761,23 @@ public class ApiController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 药店
|
|
|
+ WmDaPharmacy qWmDaPharmacy = new WmDaPharmacy();
|
|
|
+ qWmDaPharmacy.setLatitude(latitude);
|
|
|
+ qWmDaPharmacy.setLongitude(longitude);
|
|
|
+ List<WmDaPharmacy> pharmacyList = wmDaPharmacyService.listByPoint(qWmDaPharmacy);
|
|
|
+ if (CollectionUtil.isNotEmpty(pharmacyList)) {
|
|
|
+ pharmacyList.forEach(wmDaPharmacy -> {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("signEntId", wmDaPharmacy.getId());
|
|
|
+ map.put("signEntName", wmDaPharmacy.getPharmacyName());
|
|
|
+ map.put("longitude", wmDaPharmacy.getLongitude());
|
|
|
+ map.put("latitude", wmDaPharmacy.getLatitude());
|
|
|
+ map.put("signEntType", "3");
|
|
|
+ mapList.add(map);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
return R.ok(mapList);
|
|
|
}
|
|
|
|