|
|
@ -939,7 +939,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
devInfo.put("orgCode", "");
|
|
|
}
|
|
|
|
|
|
if ("4".equals(device.getCategoryCode()) || "7".equals(device.getCategoryCode())) {
|
|
|
if ("4".equals(device.getCategoryCode()) || "7".equals(device.getCategoryCode())|| "16".equals(device.getCategoryCode())) {
|
|
|
devInfo.put("sosContactsDOS", contactsService.getPatientSosContacts(patient));
|
|
|
}
|
|
|
com.alibaba.fastjson.JSONObject devInfoObj = JSON.parseObject(JSON.toJSONString(devInfo, SerializerFeature.WriteMapNullValue));
|
|
|
@ -1028,6 +1028,8 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
}
|
|
|
}
|
|
|
devInfoObj.put("currentPositioning",LatitudeUtils.getLocationAddress(lat,lon)); //当前定位
|
|
|
devInfoObj.put("currentLat",lat); //当前定位
|
|
|
devInfoObj.put("currentLon",lon); //当前定位
|
|
|
double dulat =Double.parseDouble(lat);
|
|
|
double dulon = Double.parseDouble(lon);
|
|
|
String safeArea = device.getSafeAreaGz();
|
