|
|
|
|
@ -51,7 +51,18 @@ class PlanController extends Controller
|
|
|
|
|
}
|
|
|
|
|
$list=$list->select('date', DB::raw('COUNT(*) as count'));
|
|
|
|
|
$list=$list->groupBy('date')->get();
|
|
|
|
|
|
|
|
|
|
//如果是婚检,不是星期二、五、六数量设置为0
|
|
|
|
|
if ($checkup_type_id == 4) {
|
|
|
|
|
$dates = array();
|
|
|
|
|
foreach ($list as $item) {
|
|
|
|
|
$date = $item->date;
|
|
|
|
|
$dayOfWeek = date('N', strtotime($date));
|
|
|
|
|
if (in_array($dayOfWeek, config('app.globals.HunJianXingQi')) ) {
|
|
|
|
|
$dates[] = $item;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$list = $dates;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//获取整月日期
|
|
|
|
|
// 获取当月的第一天
|
|
|
|
|
@ -141,6 +152,16 @@ class PlanController extends Controller
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//如果是婚检,不是星期二、五、六数量设置为0
|
|
|
|
|
if ($checkup_type_id == 4) {
|
|
|
|
|
|
|
|
|
|
$dayOfWeek = date('N', strtotime($date));
|
|
|
|
|
if(!in_array($dayOfWeek, config('app.globals.HunJianXingQi')) ) {
|
|
|
|
|
$list=[];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 获取前后各三天的日期
|
|
|
|
|
$dateTime = new DateTime($date);
|
|
|
|
|
@ -184,6 +205,18 @@ class PlanController extends Controller
|
|
|
|
|
}
|
|
|
|
|
$weeklist=$weeklist->select('date', DB::raw('COUNT(*) as count'));
|
|
|
|
|
$weeklist=$weeklist->groupBy('date')->get();
|
|
|
|
|
//如果是婚检,不是星期二、五、六数量设置为0
|
|
|
|
|
if ($checkup_type_id == 4) {
|
|
|
|
|
$dates = array();
|
|
|
|
|
foreach ($weeklist as $item) {
|
|
|
|
|
$date = $item->date;
|
|
|
|
|
$dayOfWeek = date('N', strtotime($date));
|
|
|
|
|
if (in_array($dayOfWeek, config('app.globals.HunJianXingQi')) ) {
|
|
|
|
|
$dates[] = $item;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$weeklist = $dates;
|
|
|
|
|
}
|
|
|
|
|
$week7=[];
|
|
|
|
|
$k=0;
|
|
|
|
|
foreach ($days7 as $date) {
|
|
|
|
|
|