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

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/MultipleCode/MultipleCoderController.java

@@ -106,7 +106,7 @@ public class MultipleCoderController extends EnvelopRestEndpoint {
            } else {
//                注册成功 返回空
                return null;
                return MixEnvelop.getSuccess("注册成功",null);
            }
        } catch (Exception e){
            e.printStackTrace();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@@ -222,7 +222,7 @@ public class MultipleCodeService {
        EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl()+"ehcService/gateway.do", oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
        TransResponse re = ehcHandler.execute(request);
        JSONObject jsonObject = new JSONObject();
        if ((JSONObject.parseObject(re.getRet_code()).toJSONString()).equalsIgnoreCase("0000")){
        if (re.getRet_code().equalsIgnoreCase("0000")){
            patientDO.setRegister("1");
            String idCard = JSONObject.parseObject(re.getBiz_content()).getString("id_no");
            if (idCard!=null)
@@ -293,7 +293,7 @@ public class MultipleCodeService {
        request.setBiz_content(JSONObject.toJSONString(bizContent));
        EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl()+"ehcService/gateway.do", oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
        TransResponse re = ehcHandler.execute(request);
        if ("0000".equals(JSONObject.parseObject(re.getRet_code()))){
        if ("0000".equalsIgnoreCase(re.getRet_code())){
            return MixEnvelop.getSuccess("获取用户信息成功",re);
        }
        return MixEnvelop.getError("获取用户信息失败");