|
|
@ -256,12 +256,12 @@ public class DeviceService {
|
|
|
String url = cloudCareUrl+"/cloudCare/noLogin/device/getDeviceLastLocation";
|
|
|
List<NameValuePair> params = new ArrayList<>();
|
|
|
params.add(new BasicNameValuePair("deviceSn", deviceDO.getDeviceSn()));
|
|
|
String response = httpClientUtil.post(url, params,"UTF-8");
|
|
|
String response = httpClientUtil.get(url, params,"UTF-8");
|
|
|
JSONObject result = com.alibaba.fastjson.JSONObject.parseObject(response);
|
|
|
JSONObject jsonObjectData =JSONObject.parseObject(AesEncryptUtils.agDecrypt(result.getString("data")));
|
|
|
Double lat = jsonObjectData.getJSONObject("data").getJSONObject("obj").getJSONObject("locationdata").getJSONObject("point").getDouble("lat");
|
|
|
Double lon = jsonObjectData.getJSONObject("data").getJSONObject("obj").getJSONObject("locationdata").getJSONObject("point").getDouble("lon");
|
|
|
String address = jsonObjectData.getJSONObject("data").getJSONObject("obj").getJSONObject("locationdata").getString("address");
|
|
|
JSONObject jsonObjectData =JSONObject.parseObject(result.getString("data"));
|
|
|
Double lat = jsonObjectData.getJSONObject("obj").getJSONObject("locationdata").getJSONObject("point").getDouble("lat");
|
|
|
Double lon = jsonObjectData.getJSONObject("obj").getJSONObject("locationdata").getJSONObject("point").getDouble("lon");
|
|
|
String address = jsonObjectData.getJSONObject("obj").getJSONObject("locationdata").getString("address");
|
|
|
|
|
|
String sql ="select DISTINCT pack.org_code,pack.org_name\n" +
|
|
|
" from base_service_package_sign_record sr,base_service_package_record pr,base_service_package_item item ,base_service_package pack\n" +
|
|
|
@ -291,8 +291,6 @@ public class DeviceService {
|
|
|
|
|
|
response = httpClientUtil.post(url, params,"UTF-8");
|
|
|
System.out.println(response);
|
|
|
System.out.println(response);
|
|
|
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@ -821,6 +819,10 @@ public class DeviceService {
|
|
|
BasePatientOutBed outBed = outBedDao.findByPatientAndDeviceSn(patient,device);
|
|
|
if (null==outBed){
|
|
|
outBed = new BasePatientOutBed();
|
|
|
}else {
|
|
|
if (0==outBed.getStatus()&&0==status){//离床状态不刷新时间，需要计算离床时长
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
outBed.setPatient(patient);
|
|
|
outBed.setDeviceSn(device);
|
