Merge remote-tracking branch 'origin/dev' into dev

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthSsoService.java

@@ -124,6 +124,22 @@ public class OauthSsoService {
                    rs.put("code",1);
                    rs.put("mes","获取居民信息成功");
                    rs.put("patient",basePatientDO);
                    List<BasePatientWechatDo> wechatDos = basePatientWechatDao.findByWechatIdAndPatientId(appId,basePatientDO.getId());
                    if(wechatDos!=null&&wechatDos.size()>0){
                        for(BasePatientWechatDo wechatDo:wechatDos){
                            wechatDo.setOpenid(openid);
                        }
                        basePatientWechatDao.save(wechatDos);
                    }else {
                        //保存openid
                        BasePatientWechatDo wechatDo = new BasePatientWechatDo();
                        wechatDo.setOpenid(openid);
                        wechatDo.setPatientId(basePatientDO.getId());
                        wechatDo.setWechatId(appId);
                        basePatientWechatDao.save(wechatDo);
                    }
                    return rs;
                }

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

@@ -425,7 +425,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					enterpriseService.sendMKMesByMobile(qywxId,d.getMobile(),"您的专家咨询有新的消息，请您尽快回复[查看详情]("+url+")");
				}else if("xm_xzzx_wx".equals(qywxId)){
					String roomUrl = "pages/doctor/onlineChat/chatroom?rstitle="+p.getName()+"%20专家咨询&type="+type+"&sessionId="+re.getString("sessiond_id");
					logger.info("发送企业号url:"+url);
					logger.info("发送企业号url:"+roomUrl);
					enterpriseService.sendXCXMesByDoctor(qywxId,
							re.getString("doctor"),
							"wx53f6bb4ac081d840",