|
@ -2414,6 +2414,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
if (listMapsOrder.size() > 0) {
|
|
|
for (Map<String, Object> stringObjectMap : listMapsOrder) {
|
|
|
tmp.put("orderId", stringObjectMap.get("id"));
|
|
|
tmp.put("orderType", 20);
|
|
|
}
|
|
|
tmp.put("eCall", 1);
|
|
|
} else {
|
|
@ -2449,13 +2450,14 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
|
|
|
break;
|
|
|
default:
|
|
|
String patientId = (String) list.get(i).get("id");
|
|
|
String orderId= "SELECT id FROM base_emergency_assistance_order WHERE `status` = '1' AND patient = '" + patientId + "'";
|
|
|
List<Map<String, Object>> listOrderId = jdbcTemplate.queryForList(orderId);
|
|
|
sql = " select ord.id from base_system_dict_entry dict LEFT JOIN base_security_monitoring_order ord " +
|
|
|
" on dict.code = ord.topic_item COLLATE utf8_unicode_ci and ord.status=" + SecurityMonitoringOrderDO.Status.apply.getType() + " where dict.dict_code='service_item' " +
|
|
|
"and dict.remark='security' and ord.patient='" + patientId + "'";
|
|
|
List<String> listOrderId = jdbcTemplate.queryForList(sql,String.class);
|
|
|
object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, deviceSn,false);
|
|
|
if (listOrderId.size()>0){
|
|
|
for (Map<String, Object> stringObjectMap : listOrderId) {
|
|
|
object.put("orderId",stringObjectMap.get("id"));
|
|
|
}
|
|
|
object.put("orderId",listOrderId.get(0));
|
|
|
object.put("orderType", 22);
|
|
|
}else {
|
|
|
object.put("orderId","");
|
|
|
}
|