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/consult/PatientConsultEndpoint.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java

@@ -510,7 +510,7 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
        logger.info("signStr"+signLocal);
        String sign = object.getString("sign");
        if (signLocal.equalsIgnoreCase(sign)){
            sflog.setAcceptTime(DateUtil.strToDate(accept_time));
            sflog.setAcceptTime(DateUtil.stampToDate(accept_time));
            sflog.setAcceptAddress(accept_address);
            sflog.setAcceptRemark(accept_remark);
            sflog.setOpCode(opcode);

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -422,6 +422,28 @@ public class DateUtil {
    }
    /*
     * 将时间戳转换为时间
     */
    public static String stampToString(String s){
        String res;
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        long lt = new Long(s);
        Date date = new Date(lt);
        res = simpleDateFormat.format(date);
        return res;
    }
    /*
     * 将时间戳转换为时间
     */
    public static Date stampToDate(String s){
        long lt = new Long(s);
        Date date = new Date(lt);
        return date;
    }
    public static String getNextDay(Date d, int days) {
        Calendar c = Calendar.getInstance();
        c.setTime(d);

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

@@ -629,14 +629,13 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value="/sfroutepushservice",method = RequestMethod.POST)
    @ApiOperation("顺丰路由信息推送")
    public String SFRoutePushServiceNew(
            @ApiParam(name="WaybillRoute", value="入参报文") @RequestParam(value = "WaybillRoute",required = true) String WaybillRoute){
    public String SFRoutePushServiceNew(@RequestBody String param){
        try {
            logger.info("顺丰路由信息推送，WaybillRoute="+WaybillRoute);
            sfexpressService.SFRoutePushServiceNew(WaybillRoute);
            logger.info("顺丰路由信息推送，WaybillRoute="+param);
            sfexpressService.SFRoutePushServiceNew(param);
            return "SUCCESS";
        }catch (Exception e){
            logger.error("接收顺丰路由信息推送失败，入参WaybillRoute:"+WaybillRoute);
            logger.error("接收顺丰路由信息推送失败，入参WaybillRoute:"+param);
            //日志文件中记录异常信息
            //返回接口异常信息处理结果
            return "FALSE";