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

src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -335,7 +335,7 @@ public class ConsultTeamService extends ConsultService {
				consultTeamDoctorDao.updateReply(log.getConsult(), teamOrDoctor);
				//shenzaixin v1.2.0 推送消息给患者
				HttpUtil.sendWeixinWebsocketMsg(patient,"data={busiType:'qianyuezixun',msgid:'"+log.getId()+"'}");
				HttpUtil.sendWeixinWebsocketMsg(patient,"{busiType:'qianyuezixun',msgid:'"+log.getId()+"'}");
			} else if (type == 0 || type == 2) {
				// 查询相关联的医生
				Iterable<ConsultTeamDoctor> iterable = consultTeamDoctorDao.findByConsult(log.getConsult());

src/main/java/com/yihu/wlyy/util/HttpUtil.java

@@ -197,6 +197,7 @@ public class HttpUtil {
		BufferedReader in = null;
		HttpURLConnection conn = null;
		try {
			System.out.println("consult-send:" + userid + ":" + data);
			String url = SystemConf.getInstance().getWeixinWebsocketServer() + "?userid=" + userid + "&data=" + data;
			URL realUrl = new URL(url);
			// 打开和URL之间的连接
@@ -219,6 +220,7 @@ public class HttpUtil {
			}
			System.out.println(buffer.toString());
			JSONObject json = new JSONObject(buffer.toString());
			System.out.println("consult-reply:" + json.toString());
			return json.toString();
		} catch (Exception e) {
			logger.error("push message error:", e);