|
|
@ -338,16 +338,12 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
|
|
|
tmpObj.put("exist","false");
|
|
|
result.put(ResponseContant.resultFlag, ResponseContant.success);
|
|
|
result.put(ResponseContant.resultMsg,tmpObj);
|
|
|
return result;
|
|
|
}
|
|
|
else {
|
|
|
BasePatientDO patientDO = patientDao.findById(assistanceDO.getPatient());
|
|
|
assistanceDO.setPatientPhoto(patientDO.getPhoto());
|
|
|
assistanceDO.setPatientSex(patientDO.getSex());
|
|
|
assistanceDO.setPatientAge(IdCardUtil.getAgeForIdcard(patientDO.getIdcard()));
|
|
|
double distance=countDistance.getDistance(Double.parseDouble(assistanceDO.getServeLat()),Double.parseDouble(assistanceDO.getServeLon()),Double.parseDouble(assistanceDO.getDoctorLat()),Double.parseDouble(assistanceDO.getDoctorLon()));
|
|
|
assistanceDO.setDistance(distance);
|
|
|
JSONObject detail = getOrderDetail(assistanceDO.getId());
|
|
|
tmpObj.put("exist","true");
|
|
|
tmpObj.put("assistanceDO",JSONObject.parseObject(JSON.toJSONStringWithDateFormat(assistanceDO,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteMapNullValue)));
|
|
|
tmpObj.put("assistanceDO",detail.getJSONObject("resultMsg"));
|
|
|
result.put(ResponseContant.resultFlag, ResponseContant.success);
|
|
|
result.put(ResponseContant.resultMsg,tmpObj);
|
|
|
}
|
