Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -27,7 +27,7 @@ class ArticleController extends AdminController
         $grid = new Grid(new Article());
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'));
-        $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普',3=>'常见问题']);
+        $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);
         $grid->column('title', __('标题'))->limit(10,'...')->width(100);
         $grid->column('content', __('内容'))->limit(20,'...')->width(200);
         $grid->column('banner_url', __('图片'))->lightbox(['width' =>'', 'height' => 30]);

app/Admin/Controllers/VaccinesManagement/VaccinesController.php

@@ -37,19 +37,20 @@ class VaccinesController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
         ];
 
-        $grid->column('organizations', '机构')->display(function (){
+        $grid->column('organizations', '机构库存')->display(function (){
             return '点击查看';
         })->modal('机构库存', function ($model) {
             $org = $model->organizationvaccines()->get()->map(function ($comment) {
-                return $comment->only(['org_id', 'stock']);
+                return $comment->only(['org_id','vaccine_id','stock']);
             });
             $org = $org->toArray();
             for($i=0;$i<count($org);$i++)
             {
                 $id = $org[$i]['org_id'];
+                $org[$i]['vaccine_id'] = $this->name;
                 $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
             }
-            return new Table(['ID', '库存' ,'机构名称'], $org);
+            return new Table(['ID','疫苗','库存','机构名称'], $org);
         });
 
         $grid->column('kc','库存');
@@ -143,7 +144,7 @@ class VaccinesController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
-        $form->switch('states','状态')->states($states);
+        $form->switch('states','状态')->states($states)->default(1);
         $form->saving(function ($f){
             $f->price *=100;
         });

app/Community/Controllers/DocterChatController.php

@@ -36,6 +36,8 @@ class DocterChatController extends AdminController
         $user = Admin::user();
         $org_id = $user->org_id;
         $docter_id = $user->docter_id;
+        $grid->model()->orderByDesc('id');
+
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
         $grid->batchActions(function ($batch) {
             $batch->add(new sendNotice());

app/Community/Controllers/ScheduleStatController.php

@@ -0,0 +1,42 @@
+<?php
+
+
+namespace App\Community\Controllers;
+
+
+use App\Models\Organization;
+use App\Models\SchedulePeriod;
+use Encore\Admin\Facades\Admin;
+use Encore\Admin\Layout\Content;
+
+class ScheduleStatController extends Admin
+{
+    public function schedule()
+    {
+        $org_id = Admin::user()->org_id;
+        if(empty($org_id)){
+            $org_id = 0;
+        }
+        $scheduleType = request('t',1);
+
+        $weekStartTime = strtotime('this week');
+        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();
+            $week[$i] = [$amCount,$pmCount,$evCount];
+        }
+
+        $data['week'] = $week;
+        $data['name'] = Organization::where(['id'=>$org_id])->value('name');
+        $content = new Content();
+        $content->title('医生排班统计');
+        $content->description('填写页面描述小标题');
+        $content->view('cdms.totalSchedule',['data'=>$data]);
+
+        return $content;
+    }
+
+}

app/Community/Controllers/Vaccine/OrganizationVaccineController.php

@@ -30,18 +30,18 @@ class OrganizationVaccineController extends AdminController
         $grid = new Grid(new OrganizationVaccine());
 
         $org_id = Admin::user()->org_id;
+
         if($org_id){
             $grid->model()->where(['org_id'=>$org_id]);
         }
         $grid->disableCreateButton(false);
 
-
         $is_admin = Admin::user()->isAdministrator();
-        $grid->filter(function ($fliter) use ($is_admin) {
+        $grid->filter(function ($fliter) use ($is_admin,$org_id) {
             if($is_admin){
                 $fliter->equal('organization.name','机构')->select(Organization::pluck('name','id'));
             }
-            $fliter->like('vaccine.name','疫苗')->select(Vaccine::pluck('name','id'));
+            $fliter->like('vaccine.name','疫苗')->select(Vaccine::where(['org_id'=>$org_id])->pluck('name','id'));
         });
 
 
@@ -108,20 +108,20 @@ class OrganizationVaccineController extends AdminController
         });
         $where = [];
         if(!empty($org_id)){
-            $where = ['id'=>$org_id];
+            $where = ['org_id'=>$org_id];
         }
         if($is_admin){
             if($form->isEditing()){
-                $form->select('org_id','机构')->options(Organization::where($where)->pluck('name','id'))->readOnly();
-                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::pluck('name','id'))->readOnly();
+                $form->select('org_id','机构')->options(Organization::where(['id'=>$org_id])->pluck('name','id'))->readOnly();
+                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::where($where)->pluck('name','id'))->readOnly();
                 $form->select('type', __('疫苗类型'))->options(OrganizationVaccine::getType())->when(1,function () use($form){
                     $form->hidden('price','价格')->value(0);
                 })->when(2,function () use($form){
                     $form->text('price','价格');
                 });
             } else {
-                $form->select('org_id','机构')->options(Organization::where($where)->pluck('name','id'));
-                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::pluck('name','id'));
+                $form->select('org_id','机构')->options(Organization::where(['id'=>$org_id])->pluck('name','id'));
+                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::where($where)->pluck('name','id'));
                 $form->select('type', __('疫苗类型'))->options(OrganizationVaccine::getType())->when(1,function () use($form){
                     $form->hidden('price','价格')->value(0);
                 })->when(2,function () use($form){

app/Community/Controllers/VaccineController.php

@@ -32,25 +32,29 @@ class VaccineController extends AdminController
     {
         $grid = new Grid(new Vaccine());
         $grid->model()->orderByDesc('id');
+        $org_id = Admin::user()->org_id;
+        if(!empty($org_id)){
+            $grid->model()->where(['org_id'=>$org_id]);
+        }
 
         $grid->disableCreateButton(false);
         $grid->column('id', __('ID'));
         $grid->column('name', __('疫苗名称'));
-        $grid->column('organizations', '机构库存')->display(function (){
-            return '点击查看';
-        })->modal('机构库存', function ($model) {
-            $org = $model->organizationvaccines()->get()->map(function ($comment) {
-                return $comment->only(['org_id','vaccine_id','stock']);
-            });
-            $org = $org->toArray();
-            for($i=0;$i<count($org);$i++)
-            {
-                $id = $org[$i]['org_id'];
-                $org[$i]['vaccine_id'] = $this->name;
-                $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
-            }
-            return new Table(['ID','疫苗','库存','机构名称'], $org);
-        });
+//        $grid->column('organizations', '机构库存')->display(function (){
+//            return '点击查看';
+//        })->modal('机构库存', function ($model) {
+//            $org = $model->organizationvaccines()->get()->map(function ($comment) {
+//                return $comment->only(['org_id','vaccine_id','stock']);
+//            });
+//            $org = $org->toArray();
+//            for($i=0;$i<count($org);$i++)
+//            {
+//                $id = $org[$i]['org_id'];
+//                $org[$i]['vaccine_id'] = $this->name;
+//                $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
+//            }
+//            return new Table(['ID','疫苗','库存','机构名称'], $org);
+//        });
         $grid->column('stocks', __('剩余库存'))->display(function (){
             return OrganizationVaccine::where(['vaccine_id'=>$this->id])->sum('stock');
         });
@@ -110,17 +114,23 @@ class VaccineController extends AdminController
 
         $orglist = Organization::pluck('name','id');
         $org_id = Admin::user()->org_id;
-        if($org_id){
-            $orglist = Organization::where(['id'=>$org_id])->pluck('name','id');
-        }
+//        if($org_id){
+//            $orglist = Organization::where(['id'=>$org_id])->pluck('name','id');
+//        }
 //        $form->editing(function ($f){
 //            $f->model()->price /= 100;
 //        });
+        $form->hidden('org_id', __('类型'))->value($org_id);
 //        $form->select('type', __('类型'))->options([1=>'一类',2=>'二类'])->default(1);
 //        $form->select('org_id','机构')->options($orglist)->rules('required',['requried'=>'请选择机构']);
-        $form->text('name', __('疫苗名称'))->creationRules(['required', "unique:vaccines"])
-            ->updateRules(['required', "unique:vaccines,name,{{id}}"]);
-        $form->hidden('states')->value(1);
+        $form->text('name', __('疫苗名称'))->rules('required',['required'=>'请输入疫苗']);
+//        $form->text('name', __('疫苗名称'))->creationRules(['required', "unique:vaccines"])
+//            ->updateRules(['required', "unique:vaccines,name,{{id}}"]);
+        $states = [
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
+        ];
+        $form->switch('states','状态')->states($states)->default(1);
 //        $form->text('stock', __('库存'))->rules('required',['requried'=>'请填写库存']);
 //        $form->textarea('remark', __('备注'));
 //        $form->saving(function ($form){

app/Community/routes.php

@@ -3,7 +3,8 @@
 Route::get('/', 'HomeController@home');
 Route::get('/home', 'HomeController@home');
 
-Route::get('/total_schedule', 'HomeController@schedule');
+//Route::get('/total_schedule', 'HomeController@schedule');
+Route::get('/total_schedule', 'ScheduleStatController@schedule');
 Route::resource('nurses', NurseController::class);
 //机构设置
 Route::resource('organization_setting', SettingController::class);

app/Models/Article.php

@@ -15,7 +15,6 @@ class Article extends BaseModel
     public static $_post_type = [
         1=>'健康科普',
         2=>'疫苗科普',
-        3=>'常见问题'
     ];
     public function getIsCollectAttribute()
     {

resources/views/cdms/schedule.blade.php

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>scheduling</title><link href="static/css/app.b0dfcc84.css" rel="preload" as="style"><link href="static/css/chunk-vendors.767f701c.css" rel="preload" as="style"><link href="static/js/app.3c727ef2.js" rel="preload" as="script"><link href="static/js/chunk-vendors.feab90c7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.767f701c.css" rel="stylesheet"><link href="static/css/app.b0dfcc84.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but scheduling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.feab90c7.js"></script><script src="static/js/app.3c727ef2.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>scheduling</title><link href="static/css/app.b0dfcc84.css" rel="preload" as="style"><link href="static/css/chunk-vendors.767f701c.css" rel="preload" as="style"><link href="static/js/app.a0b066b1.js" rel="preload" as="script"><link href="static/js/chunk-vendors.feab90c7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.767f701c.css" rel="stylesheet"><link href="static/css/app.b0dfcc84.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but scheduling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.feab90c7.js"></script><script src="static/js/app.a0b066b1.js"></script></body></html>

resources/views/cdms/totalSchedule.blade.php

@@ -0,0 +1,48 @@
+<div class="box">
+    <div class="box-header">
+        <h3 class="box-title">机构{{$data['name']}}排班页面</h3>
+    </div>
+    <!-- /.box-header -->
+    <div class="box-body">
+        <div id="example2_wrapper" class="dataTables_wrapper form-inline dt-bootstrap"><div class="row"><div class="col-sm-6"></div><div class="col-sm-6"></div></div><div class="row"><div class="col-sm-12"><table id="example2" class="table table-bordered table-hover dataTable" role="grid" aria-describedby="example2_info">
+                        <thead>
+                        <tr role="row">
+                            <th class="sorting" tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="Rendering engine: activate to sort column ascending">Rendering engine</th>
+                            <th class="sorting_desc" tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="Browser: activate to sort column ascending" aria-sort="descending">Browser</th>
+                            <th class="sorting" tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="Platform(s): activate to sort column ascending">Platform(s)</th>
+                            <th class="sorting" tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="Engine version: activate to sort column ascending">Engine version</th>
+                            <th class="sorting" tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="CSS grade: activate to sort column ascending">CSS grade</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr role="row" class="odd">
+                            <td class="">Presto</td>
+                            <td class="sorting_1">Opera 9.0</td>
+                            <td>Win 95+ / OSX.3+</td>
+                            <td>-</td>
+                            <td>A</td>
+                        </tr>
+                        <tr role="row" class="even">
+                            <td class="">Presto</td>
+                            <td class="sorting_1">Opera 8.5</td>
+                            <td>Win 95+ / OSX.2+</td>
+                            <td>-</td>
+                            <td>A</td>
+                        </tr><tr role="row" class="odd">
+                            <td class="">Presto</td>
+                            <td class="sorting_1">Opera 8.0</td>
+                            <td>Win 95+ / OSX.2+</td>
+                            <td>-</td>
+                            <td>A</td>
+                        </tr><tr role="row" class="even">
+                            <td class="">Presto</td>
+                            <td class="sorting_1">Opera 7.5</td>
+                            <td>Win 95+ / OSX.2+</td>
+                            <td>-</td>
+                            <td>A</td>
+                        </tr>
+                        <tfoot>
+                        <tr><th rowspan="1" colspan="1">Rendering engine</th><th rowspan="1" colspan="1">Browser</th><th rowspan="1" colspan="1">Platform(s)</th><th rowspan="1" colspan="1">Engine version</th><th rowspan="1" colspan="1">CSS grade</th></tr>
+                        </tfoot>
+                    </table>
+</div>