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

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

@@ -1919,6 +1919,7 @@ public class ImService {
				"d.idcard as patientIdcard," +
				"d.sex as patientsex," +
				"d.photo AS patientphoto, " +
				"doctor.name AS doctorName, " +
				"doctor.job_title_name AS jobTitleName " +
				"FROM wlyy_consult a," +
				"wlyy_consult_team b," +
@@ -2055,6 +2056,9 @@ public class ImService {
			case "8":
				tableName = "muc_messages";
				break;
			case "15":
				tableName = "muc_messages";
				break;
			case "2":
				tableName = "p2p_messages";
				break;

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

@@ -599,6 +599,8 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
				
				//医生职称
				json.put("jobTitleName", consult.getJobTitleName());
				//医生名称
				json.put("doctorName", consult.getDoctorName());
				
				// 设置显示标题
				json.put("title", consult.getTitle());