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

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

@@ -312,7 +312,7 @@ public class DeviceService {
                            if (sqlResult.size()>0){
                                //疑似离开安全区域 v1.5电子围栏为确认管理时触发
                                List<PatientSafeAreaDO> safeAreaDOS = safeAreaDao.findByPatient(patientDO.getId());
                                if (safeAreaDOS.size()>0){
                                if (safeAreaDOS.size()==0){
                                    return;
                                }
                                url = cloudCareUrl+"/cloudCare/noLogin/security/createOrder";

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/util/SecurityOrderUtil.java

@@ -103,7 +103,7 @@ public class SecurityOrderUtil {
                }
                if ("1".equals(dictCode)){//疑似离开安全区域 v1.5电子围栏为确认管理时触发
                    List<PatientSafeAreaDO> safeAreaDOS = safeAreaDao.findByPatient(patientDO.getId());
                    if (safeAreaDOS.size()>0){
                    if (safeAreaDOS.size()==0){
                        return new JSONObject();
                    }
                }