|
|
|
@ -309,13 +309,12 @@ class AppointmentController extends Controller
|
|
|
|
$appointment->used_count = $appointment->max_count;
|
|
|
|
$appointment->used_count = $appointment->max_count;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$list[$date]['info'] += max($appointment->max_count - $appointment->used_count, 0);
|
|
|
|
$list[$date]['info'] += max($appointment->max_count - $appointment->used_count, 0);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$list[$date]['data']['list'][] = $appointment;
|
|
|
|
$list[$date]['data']['list'][] = $appointment;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$l = [];
|
|
|
|
$l = [];
|
|
|
|
foreach ($list as $item) {
|
|
|
|
foreach ($list as $item) {
|
|
|
|
if($item['info']==0){
|
|
|
|
if($item['info']==0 and $item['date']>=date('Y-m-d')){
|
|
|
|
$item['info']='已满';
|
|
|
|
$item['info']='已满';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$l[] = $item;
|
|
|
|
$l[] = $item;
|
|
|
|
|