Swdz-WangHaiJun 4 éve
szülő
commit
110387e4b7

+ 1 - 1
app/Admin/Controllers/Chart/OrderChart.php

xqd
@@ -80,7 +80,7 @@ class OrderChart
     public function getData($year,$month,$type)
     {
 
-        //type 1默认选择当前月份 2根据时间
+        //type 1默认选择当前月份 2根据时间+
         $month >10??$month = '0'.$month;
 
         if($type == 1){

+ 37 - 10
app/Community/Controllers/HomeController.php

xqd xqd xqd
@@ -28,28 +28,36 @@ class HomeController extends Controller
             ->description('社区段实时数据')
             ->row(function (Row $row){
                    return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">实时概况</p>');
-            })->row(function (Row $row){
+            })
+            ->row(function (Row $row){
                 $data = StatController::service();
-                $row->column(3,new InfoBox('今日预约(人)', 'users', 'aqua', '/cdms/home', $data['schedule_paitent']));
+                $row->column(3,new InfoBox('今日预约数量(人)', 'users', 'aqua', '/cdms/home', $data['schedule_paitent']));
                 $row->column(3,new InfoBox('今日排班(人)', 'calendar-check-o', 'aqua', '/cdms/home', $data['schedule_docter']));
                 $row->column(3,new InfoBox('接诊患者(人次)', 'user', 'aqua', '/cdms/home', $data['paitent_num']));
             })
             ->row(function (Row $row){
                 return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">疫苗概况</p>');
-            })->row(function (Row $row){
+            })
+            ->row(function (Row $row){
                 $data = StatController::vaccine();
-                $row->column(3,new InfoBox('疫苗种类(种)', 'eyedropper', 'aqua', '/cdms/home', $data['sum_num']));
-                $row->column(3,new InfoBox('库存剩余(支)', 'home', 'aqua', '/cdms/home', $data['have_num']));
-                $row->column(3,new InfoBox('疫苗缺苗(种)', 'genderless', 'aqua', '/cdms/home', $data['less_num']));
+                $row->column(3,new InfoBox('今日预约数量(人次)', 'users', 'aqua', '/cdms/home', $data['schedule_paitent']));
+//                $row->column(3,new InfoBox('疫苗种类(种)', 'eyedropper', 'aqua', '/cdms/home', $data['sum_num']));
+                $row->column(3,new InfoBox('疫苗库存量)', 'home', 'aqua', '/cdms/home', $data['have_num']));
+                $row->column(3,new InfoBox('疫苗库存告急(种)', 'genderless', 'aqua', '/cdms/home', $data['less_num']));
+
             })
             ->row(function (Row $row){
                 $data = StatController::vaccine();
-                $row->column(3,new InfoBox('今日预约(人支)', 'hospital-o', 'aqua', '/cdms/home', $data['today_schedule']));
-                $row->column(3,new InfoBox('预计今日消耗(支)', 'calendar', 'aqua', '/cdms/home', $data['today_vaccine']));
+                $row->column(3,new InfoBox('昨日接种量(人次)', 'genderless', 'aqua', '/cdms/home', $data['less_num']));
+                $row->column(3,new InfoBox('明日预约量(人次)', 'genderless', 'aqua', '/cdms/home', $data['less_num']));
+
+//                $row->column(3,new InfoBox('今日预约(人支)', 'hospital-o', 'aqua', '/cdms/home', $data['today_schedule']));
+//                $row->column(3,new InfoBox('预计今日消耗(支)', 'calendar', 'aqua', '/cdms/home', $data['today_vaccine']));
             })
             ->row(function (Row $row){
                 return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">订单概况</p>');
-            })->row(function (Row $row){
+            })
+            ->row(function (Row $row){
                 $data = StatController::nurse();
                 $row->column(3,new InfoBox('门诊订单(个)', 'first-order', 'aqua', '/cdms/home', $data[0]));
                 $row->column(3,new InfoBox('计免订单(个)', 'first-order', 'aqua', '/cdms/home', $data[1]));
@@ -57,7 +65,8 @@ class HomeController extends Controller
             })
             ->row(function (Row $row){
                 return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">今日排班         </p>');
-            })->row(function (Row $row){
+            })
+            ->row(function (Row $row){
                 $data = StatController::schedule();
                 $row->column(3,new InfoBox('计免医生(人)', 'hospital-o', 'aqua', '/cdms/home', $data['vaccine_num']));
                 $row->column(3,new InfoBox('儿保医生(人)', 'hospital-o', 'aqua', '/cdms/home', $data['nurse_num']));
@@ -69,6 +78,24 @@ class HomeController extends Controller
 //            ->row($this->schedule_data());
     }
 
+
+//1. 门诊预约
+//(1) 今日预约数量
+//(2) 今日排班(人)
+//(3) 昨日预约数
+//(4) 昨日接诊人数
+//2. 计免预约
+//(1) 今日预约数量(人次)
+//(2) 疫苗库存量
+//(3) 疫苗库存告急(种)
+//(4) 昨日接种量(人次)
+//(5) 明日预约量(人次)
+//3. 儿保预约
+//(1) 今日预约数量(人次)
+//(2) 昨日预约数量(人次)
+//(3) 昨日服务数量(人次)
+//(4) 明日预约数量(人次)
+
     public function real_data()
     {
         $data = StatController::service();

+ 2 - 2
app/Community/Controllers/OrderVaccinesController.php

xqd
@@ -71,9 +71,9 @@ class OrderVaccinesController extends AdminController
             return implode(',',$vaccine_name);
 
         });
-        $grid->column('docter.name', __('排班医生'));
+//        $grid->column('docter.name', __('排班医生'));
         $grid->column('order_status', __('订单状态'))->using(Order::getStatus())->label('info');
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label('info');
+//        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label('info');
 
         $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {

+ 14 - 0
app/Community/Controllers/StatController.php

xqd
@@ -98,4 +98,18 @@ return $data;
         }
         return $data;
     }
+
+    //门诊统计
+    public static function clinc()
+    {
+
+        $orgId = self::$org_id;
+        $order = Order::where(['product_type'=>3,'organization_id'=>$orgId]);
+        $today = $order->where('created_at','>=',date('Y-m-d'))->whereNotIn('order_status',[1,5,6])->count();
+        $docters = Schedule::where(['organization'=>$orgId,'schedule_date'=>date('Y-m-d',time())])->count();
+        $yesterday = $order->whereBetween(date('Y-m-d',[strtotime('-1days'),date('Y-m-d')]))->whereNotIn('order_status',[1,5,6])->count();
+        $yesterday = $order->whereBetween(date('Y-m-d',[strtotime('-1days'),date('Y-m-d')]))->whereNotIn('order_status',[1,5,6])->count();
+
+        return [];
+    }
 }