|
|
|
|
@ -352,7 +352,7 @@ class Orders extends SoftDeletesModel
|
|
|
|
|
foreach ($unGeneratedOrders as $order) {
|
|
|
|
|
dump("hi");
|
|
|
|
|
$service_date = date("Y-m-d");
|
|
|
|
|
$order->createItem($service_date);
|
|
|
|
|
(new Orders())->find($order->id)->createItem($service_date);
|
|
|
|
|
if (Carbon::parse($service_date)->greaterThan($order->to_date)) {
|
|
|
|
|
$order->update([
|
|
|
|
|
"to_date" => $service_date
|
|
|
|
|
@ -451,7 +451,7 @@ class Orders extends SoftDeletesModel
|
|
|
|
|
$model = $model->where("status", 1);
|
|
|
|
|
$model = $model->with(["project", "levelInProject"]);
|
|
|
|
|
$model = $model->withCount(["orders"]);
|
|
|
|
|
$model = $model->select("id", "name", "avatar", "sex", "birthday", "hometown", "work_years", "paramedic_level_id", "project_id","has_health_certificate","has_work_certificate");
|
|
|
|
|
$model = $model->select("id", "name", "avatar", "sex", "birthday", "hometown", "work_years", "paramedic_level_id", "project_id", "has_health_certificate", "has_work_certificate");
|
|
|
|
|
//性别筛选:如果是女患者,选择女的护工
|
|
|
|
|
if ($request->sex == "女") {
|
|
|
|
|
$model = $model->where("sex", "女");
|
|
|
|
|
|