数据中心数据优化

app/Community/Controllers/HomeController.php

@@ -32,8 +32,8 @@ class HomeController extends Controller
             ->row(function (Row $row){
                 $data = StatController::orderTotal();
                 $row->column(3,new InfoBox('门诊订单总数(个)', 'users', 'aqua', '/cdms/orders', $data[0]));
-                $row->column(3,new InfoBox('儿保订单总数(个)', 'calendar-check-o', 'aqua', '/cdms/nurse_users', $data[1]));
-                $row->column(3,new InfoBox('计免订单总数(个)', 'user', 'aqua', '/cdms/order_vaccines', $data[2]));
+                $row->column(3,new InfoBox('计免订单总数(个)', 'user', 'aqua', '/cdms/order_vaccines', $data[1]));
+                $row->column(3,new InfoBox('儿保订单总数(个)', 'calendar-check-o', 'aqua', '/cdms/order_nuurse', $data[2]));
                 $row->column(3,new InfoBox('服务患者次数(次)', 'user', 'aqua', '/cdms/home', $data[3]));
             })
             ->row(function (Row $row){

app/Community/Controllers/ScheduleStatController.php

@@ -23,9 +23,10 @@ class ScheduleStatController extends Admin
         for ($i=1;$i<=7;$i++){
             $time = $weekStartTime + ($i-1)*86400;
             $date = date('Y-m-d',$time);
-            $amCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>1,'schedule_type'=>$scheduleType])->count();
-            $pmCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>2,'schedule_type'=>$scheduleType])->count();
-            $evCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>3,'schedule_type'=>$scheduleType])->count();
+
+            $amCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>1,'schedule_type'=>$scheduleType])->distinct('docter_id')->count();
+            $pmCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>2,'schedule_type'=>$scheduleType])->distinct('docter_id')->count();
+            $evCount = SchedulePeriod::where(['organization_id'=>$org_id,'schedule_date'=>$date,'type'=>3,'schedule_type'=>$scheduleType])->distinct('docter_id')->count();
             $week[$i] = [$amCount,$pmCount,$evCount];
         }
 

app/Community/Controllers/StatController.php

@@ -202,7 +202,7 @@ class StatController extends  Controller
         })->whereNotIn('order_status',[1,5,6])->count();
 
         //医生排班人数
-        $docters = SchedulePeriod::where(['schedule_date'=>date('Y-m-d',time())])->where($where)->distinct('docter_id')->count('docter_id');
+        $docters = SchedulePeriod::where(['schedule_date'=>date('Y-m-d',time()),'schedule_type'=>1])->where($where)->distinct('docter_id')->count();
 
         //昨日预约
         $yesterday = $order->whereHas('orderPatient',function ($query){