Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -2448,7 +2448,17 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        object.put("info", tmp);
                        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);
                        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"));
                            }
                        }else {
                            object.put("orderId","");
                        }
                        break;
                }
                object.put("patientInfo", patientTmp);