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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientHealthIndexService.java

@@ -298,7 +298,7 @@ public class PatientHealthIndexService extends BaseJpaService<DevicePatientHealt
                        obj.put("value1", data);
                        obj.put("time1", recordDate);
                        obj.put("id1", id);
                        obj.put("deviceSn1", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("2")) {
                        obj.put("value2", data);
@@ -310,31 +310,31 @@ public class PatientHealthIndexService extends BaseJpaService<DevicePatientHealt
                        obj.put("value3", data);
                        obj.put("time3", recordDate);
                        obj.put("id3", id);
                        obj.put("deviceSn3", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("4")) {
                        obj.put("value4", data);
                        obj.put("time4", recordDate);
                        obj.put("id4", id);
                        obj.put("deviceSn4", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("5")) {
                        obj.put("value5", data);
                        obj.put("time5", recordDate);
                        obj.put("id5", id);
                        obj.put("deviceSn5", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("6")) {
                        obj.put("value6", data);
                        obj.put("time6", recordDate);
                        obj.put("id6", id);
                        obj.put("deviceSn6", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    } else if (dataType.equals("7")) {
                        obj.put("value7", data);
                        obj.put("time7", recordDate);
                        obj.put("id7", id);
                        obj.put("deviceSn7", deviceSn);
                        obj.put("deviceSn2", deviceSn);
                        hadData = true;
                    }
                    

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

@@ -2452,7 +2452,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        String patientId = (String) list.get(i).get("id");
                        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 + "'";
                                "and dict.remark='security' and ord.patient='" + patientId + "' and dict.code='"+topicItem+"' ";
                        List<String> listOrderId = jdbcTemplate.queryForList(sql,String.class);
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, deviceSn,false);
                        if (listOrderId.size()>0){