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/SendPatientUtil.java

@@ -22,6 +22,6 @@ public class SendPatientUtil {
			throw  new RuntimeException(sessionJson.getString("message"));
		}
		JSONObject session = sessionJson.getJSONObject("data");
		return ImUtill.sendImMsg(from,fromName,session.getString("id"),contentType,content);
		return ImUtill.sendImMsg(from,fromName,session.getString("id"),contentType,content,"1");
	}
}