Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

Conflicts:
	patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SendP2PUtil.java

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpUtil.java

@@ -126,12 +126,12 @@ public class HttpUtil {
	 * 消息推送
	 *
	 * @param receiver 消息接收人
	 * @param msgType 消息类型
	 * @param businessType 消息类型
	 * @param title 消息标题
	 * @param msg 消息内容
	 * @param data 消息数据
	 */
	public static boolean pushMessage(String receiver, String msgType, String title, String msg, String data) {
	public static boolean pushMessage(String receiver, String businessType, String title, String msg, String data) {
		try{
			JSONObject participants = new JSONObject();
			participants.put("system",0);
@@ -141,7 +141,7 @@ public class HttpUtil {
				throw  new RuntimeException(sessionObj.getString("message"));
			}
			JSONObject session = sessionObj.getJSONObject("data");
			ImUtill.sendImMsg("system","系统",session.getString("id"),"1", msg,msgType);
			ImUtill.sendImMsg("system","系统",session.getString("id"),"1", msg,businessType);
			return true;
		}catch (Exception e){
			e.printStackTrace();