|
|
@@ -180,7 +180,7 @@ public class AmqpClient2 {
|
|
|
JSONObject items = json.getJSONObject("items");
|
|
|
JSONObject localJson = null;
|
|
|
|
|
|
- String hospitalCode = items.containsKey("userId") ? "" : items.getString("userId");
|
|
|
+ String hospitalCode = !items.containsKey("userId") ? "" : items.getString("userId");
|
|
|
if(StringUtils.isEmpty(hospitalCode)) {
|
|
|
// String sql = "SELECT h.code FROM bus_hospital h inner join bus_device d on d.tenant_id = h.tenant_id where device_id=? limit 1";
|
|
|
// try {
|
|
|
@@ -200,10 +200,10 @@ public class AmqpClient2 {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- String ci = items.containsKey("ci") ? "" : items.getString("ci");
|
|
|
- String lac = items.containsKey("lac") ? "" : items.getString("lac");
|
|
|
+ String ci = !items.containsKey("ci") ? "" : items.getString("ci");
|
|
|
+ String lac = !items.containsKey("lac") ? "" : items.getString("lac");
|
|
|
if(!"".equals(ci) && !"".equals(lac)) {
|
|
|
- String mnc = items.containsKey("mnc") ? "00" : items.getString("mnc");
|
|
|
+ String mnc = !items.containsKey("mnc") ? "00" : items.getString("mnc");
|
|
|
localJson = getLocation(mnc,lac,ci);
|
|
|
items.put("location", localJson);
|
|
|
}
|