Merge remote-tracking branch 'origin/dev' into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -228,7 +228,7 @@ public class PatientDeviceService extends BaseService {
		filters.put("patient", new SearchFilter("user", Operator.EQ, patientCode));
		filters.put("del", new SearchFilter("del", Operator.EQ, 0));
		//filters.put("del", new SearchFilter("del", Operator.EQ, 0));
		if(id > 0){
			filters.put("id", new SearchFilter("id", Operator.LT, id));