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

# Conflicts:
#	common/common-entity/sql记录

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -1849,7 +1849,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }else {
            try {
                Map<String,Object> rs = registerService.registerPatient(mobile,pw,name,idcard);
                Map<String,Object> rs = registerService.registerPatient(mobile,pw,name,idcard,openid);
                String code = rs.get("code").toString();
                if(!"1".equals(code)){
                    ObjEnvelop objEnvelop = new ObjEnvelop();

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

@@ -120,7 +120,7 @@ public class RegisterService {
        rs.put("mes","保存用户信息失败");
        return rs;
    }
    public Map<String,Object> registerPatient(String mobile,String pw,String name,String idcard)throws Exception{
    public Map<String,Object> registerPatient(String mobile,String pw,String name,String idcard,String openid)throws Exception{
        Map<String,Object> rs = new HashedMap();
        try{
@@ -146,6 +146,9 @@ public class RegisterService {
            if (StringUtils.isNoneBlank(idcard)){
                patient.setIdcard(idcard);
            }
            if(StringUtils.isNoneBlank(openid)){
                patient.setIdcard(openid);
            }
            BasePatientDO temp = basePatientDao.save(patient);
            PatientMedicareCardDO medicareCardDO = new PatientMedicareCardDO();