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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/PatientConsultEndpoint.java

@@ -119,6 +119,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@ApiOperation(value = "im推送个推消息")
	public Envelop sendGetuiMessage(String sessionId,String type,String senderName,String senderId,String targetId){
		try {
			logger.info("im推送1个推消息"+sessionId+","+senderName+","+targetId);
			String body = "收到来自"+senderName+"的一条消息，请关注并及时处理。";
			String peerName = null;
			String sql = "SELECT name from im_internet_hospital.sessions WHERE id = '"+sessionId+"'";

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/BirthdayReminderService.java

@@ -50,7 +50,7 @@ public class BirthdayReminderService {
                    messageUtil.sendTXYSJson("1099809",mobile,doctorName,c+"");
                }
                if(c>0){
                    String body = "您好，今天有"+c+"位老人走访计划，请及时处理";
                    String body = "您好，今天有"+c+"位老人过生日，赶紧去送上祝福吧";
                    messageUtil.sendDoctorGetuiMessage(doctorId,"1","/solicitude/birthday","生日祝福提醒",body);
                }
            }catch (Exception e){