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

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/TimeoutOverDueService.java

@@ -228,7 +228,12 @@ public class TimeoutOverDueService {
                    baseNatAppointmentDao.save(baseNatAppointmentDO);
                }
                //取消预约
                //entranceService.BS10145(baseNatAppointmentDO.getDept(),baseNatAppointmentDO.getDoctorId(), DateUtil.dateToStr(baseNatAppointmentDO.getAppointmentTime(),"yyyy-MM-dd hh:mm:ss"),baseNatAppointmentDO.getMedicare(),baseNatAppointmentDO.getName(),baseNatAppointmentDO.getMobile());
                try {
                    entranceService.BS10145(baseNatAppointmentDO.getDept(),baseNatAppointmentDO.getDoctorId(), DateUtil.dateToStr(baseNatAppointmentDO.getAppointmentTime(),"yyyy-MM-dd hh:mm:ss"),baseNatAppointmentDO.getMedicare(),baseNatAppointmentDO.getName(),baseNatAppointmentDO.getPatientId(),baseNatAppointmentDO.getMobile(),false);
                    //取消挂号
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }