Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -248,6 +248,12 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			object.put("socket_sms_type",6);
			object.put("relation_code",wlyyOutpatientDO.getId());
			imService.sendWaiSocketMessage(wlyyOutpatientDO.getDoctor(),wlyyOutpatientDO.getGeneralDoctor(),object.toString(),"1");
		}else{
			System.out.println("发送外层SOCKET消息：协同门诊医生抢单之后，通知居民修改状态");
			JSONObject object = new JSONObject();
			object.put("socket_sms_type",6);
			object.put("relation_code",wlyyOutpatientDO.getId());
			imService.sendWaiSocketMessage(wlyyOutpatientDO.getDoctor(),wlyyOutpatientDO.getPatient(),object.toString(),"1");
		}
		return success("请求成功");
	}