|
@ -4781,7 +4781,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
if (one.getEndTime().before(workTimeDO.getStartTime()) || one.getStartTime().after(workTimeDO.getEndTime())) {
|
|
if (one.getEndTime().before(workTimeDO.getStartTime()) || one.getStartTime().after(workTimeDO.getEndTime())) {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
throw new Exception("您选择的时间与“开始时间:"+one.getStartTime()+"-结束时间:"+one.getEndTime()+"”的医院排班/自己排班冲突,请重新选择!");
|
|
|
|
|
|
throw new Exception("您选择的时间与“开始时间:"+DateUtil.dateToStrLong(one.getStartTime())+"-结束时间:"+DateUtil.dateToStrLong(one.getEndTime())+"”的医院排班/自己排班冲突,请重新选择!");
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|