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

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -10,7 +10,6 @@ import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
@@ -402,7 +401,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
     */
    @RequestMapping(value = "/getOpenidByCode", method = {RequestMethod.POST, RequestMethod.GET})
    @ResponseBody
    public Envelop getOpenidByCode(String code,String patientId) throws Exception {
    public Envelop getOpenidByCode(String code) throws Exception {
        //通过redis获取openid, 获取不到,则调用微信接口去取
        String key = wxId+":code";
        String openid = redisTemplate.opsForValue().get(key);
@@ -410,20 +409,6 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            return success(PatientRequestMapping.Wechat.api_success,openid);
        }
        openid = wechatInfoService.getOpenidByCode(code, wxId);
        List<BasePatientWechatDo> patientWechatDoList =  patientWechatDao.findByWechatIdAndPatientId(wxId,patientId);
        if (patientWechatDoList!=null&&patientWechatDoList.size()!=0){
            BasePatientWechatDo patientWechatDo = patientWechatDoList.get(0);
            patientWechatDo.setOpenid(openid);
            patientWechatDao.save(patientWechatDo);
        }else {
            BasePatientWechatDo patientWechatDo = new BasePatientWechatDo();
            patientWechatDo.setCreateTime(new Date());
            patientWechatDo.setOpenid(openid);
            patientWechatDo.setWechatId(wxId);
            patientWechatDo.setPatientId(patientId);
            patientWechatDo.setSaasId("dev");
            patientWechatDao.save(patientWechatDo);
        }
        redisTemplate.opsForValue().set(key,openid);
        redisTemplate.expire(key,10, TimeUnit.SECONDS);
        return success(PatientRequestMapping.Wechat.api_success,openid);