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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java

@@ -283,6 +283,30 @@ public class YkyyService {
    }
    /**
     * 眼科通登录接口
     * @param tel
     * @param password
     * @return
     */
    public String yktLogin(String tel,String password){
        String response="";
        String url = yktUrl+"user_center/patient_login?patient_account="+tel+"&patient_pwd="+password;
        response = httpClientUtil.get(url,"GBK");
        logger.info("获取眼科通登录信息:"+response);
        return response;
    }
  /*  public String forgetPassword(String tel,String password){
        String response="";
        String url = "http://www.yanketong.com:90/api/Patient/ForgotPassword";
        response = httpClientUtil.httpPost(url,"GBK");
        logger.info("获取眼科通登录信息:"+response);
        return response;
    }*/
    /**
     * 同步眼科通数据
     * @param patient
@@ -417,4 +441,6 @@ public class YkyyService {
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/ykyy/YkyyController.java

@@ -76,6 +76,28 @@ public class YkyyController extends EnvelopRestEndpoint {
    }
    /**
     * 眼科通登录接口
     *
     * @param tel
     * @param password
     * @return
     */
    @GetMapping(value = "/yktLogin")
    @ApiOperation(value = "眼科通登录接口")
    public ObjEnvelop yktLogin(@ApiParam(name = "tel", value = "电话号码", required = true)
                                @RequestParam(value = "tel",required = true)String tel,
                                @ApiParam(name = "password", value = "", required = true)
                                @RequestParam(value = "password",required = false)String password){
        try {
            return ObjEnvelop.getSuccess("ok",ykyyService.yktLogin(tel,password));
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }
    }
    /**
     * 创建订单
     * @param json