Merge branch 'dev' of linzhuo/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/task/PushMsgTask.java

@@ -136,7 +136,7 @@ public class PushMsgTask {
			org.json.JSONObject participants = new org.json.JSONObject();
			participants.put("system",0);
			participants.put(receiver,0);
			org.json.JSONObject sessionObj  = ImUtill.createSession(url,participants,"2","系统消息","");
			org.json.JSONObject sessionObj  = ImUtill.createSession(url,participants,"0","系统消息","");
			if(sessionObj.getInt("status")==-1){
				throw  new RuntimeException(sessionObj.getString("message"));
			}

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));