Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -628,8 +628,9 @@ public class ImService {
		
		JSONObject users = new JSONObject();
		users.put(doctor,0);
		
		// 设置医生名称
		BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
		// 设置患者信息
		ct.setPatient(patient);
		// 查询患者信息
@@ -655,6 +656,10 @@ public class ImService {
//		consult.setGuidance(ct.getGuidance());
		// 设置咨询标识
		ct.setConsult(consult.getId());
		// 设置医生CODE
		ct.setDoctor(doctor);
		// 设置医生名称
		ct.setDoctorName(baseDoctorDO.getName());
		
		JSONObject jsonObject = new JSONObject();
		jsonObject.put("title", tempPatient.getName() + "申请专家咨询");