Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/label/PatientLableService.java

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

@@ -1340,7 +1340,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        }else{
            result.put("smoke",list1.get(0).get("value"));
        }
        result.put("orderNum",getOrder(patient,"preventFire"));
        result.put("smokeOrderNum",getOrder(patient,"preventFire"));
        monitorInfo(result, patient);
    }
@@ -1362,7 +1362,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        }else{
            result.put("methane",list1.get(0).get("value"));
        }
        result.put("orderNum",getOrder(patient,"preventGasLeakage"));
        result.put("methaneOrderNum",getOrder(patient,"preventGasLeakage"));
        monitorInfo(result, patient);
    }