bug 修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -1008,7 +1008,7 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        String sqlDevice = "SELECT pd.category_code deviceFlag, IFNULL(d.contact_status,0) status from wlyy_patient_device pd,wlyy_devices d";
        for (Map<String,Object> map:list){
            String paientId = map.get("id").toString();
            String filterDevice = " WHERE pd.device_sn = d.device_code and pd.user = '"+paientId+"' ORDER BY deviceFlag,status desc";
            String filterDevice = " WHERE 1=1 and  pd.category_code <> '17' and pd.device_sn = d.device_code and pd.user = '"+paientId+"' ORDER BY deviceFlag,status desc";
            String idcardNo = map.get("idcard") + "";
            Date birthday = DateUtil.strToDate(map.get("birthday").toString());
            Integer age = IdCardUtil.getAgeByIdcardOrBirthday(idcardNo,birthday);

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

@@ -1660,7 +1660,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        result.put("fall", null);
                    }else {
                        Integer count = Integer.parseInt(tmp.get("total").toString());
                        result.put("ordDeviceSN",tmp.get("device_sn").toString());
                        result.put("ordDeviceSN",tmp.get("device_sn"));
                        if (count > 0) {
                            result.put("fall", true);
                        } else {