后台机构管理

app/Admin/Controllers/OrganizationController.php

@@ -32,9 +32,15 @@ class OrganizationController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('type', __('类型'));
         $grid->column('name', __('名称'));
-        $grid->column('province_id', __('省份'));
-        $grid->column('city_id', __('城市'));
-        $grid->column('area_id', __('地区'));
+        $grid->column('province_id', __('省份'))->display(function ($id){
+            return Area::where('id',$id)->value('name');
+        });
+        $grid->column('city_id', __('城市'))->display(function ($id){
+            return Area::where('id',$id)->value('name');
+        });
+        $grid->column('area_id', __('地区'))->display(function ($id){
+            return Area::where('id',$id)->value('name');
+        });
         $grid->column('address', __('详细地址'));
         $grid->column('latitude', __('经度'));
         $grid->column('longitude', __('纬度'));

app/Admin/Controllers/QualificationController.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Qualification;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class QualificationController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '资质列表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Qualification());
+
+        $grid->column('id', __('ID'));
+        $grid->column('name', __('资质名称'));
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Qualification::findOrFail($id));
+
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Qualification());
+
+        $form->text('name', __('资质名称'));
+
+        return $form;
+    }
+}

app/Admin/routes.php

@@ -14,7 +14,8 @@ Route::group([
     $router->get('/api/getCity', 'ApiController@getCity');
     $router->get('/api/getArea', 'ApiController@getArea');
     $router->resource('/cdms_user', CdmsController::class);
-    $router->resource('organizations', OrganizationController::class);
-    $router->resource('docters', DocterController::class);
+    $router->resource('/organizations', OrganizationController::class);
+    $router->resource('/docters', DocterController::class);
+    $router->resource('/qualifications', QualificationController::class);
 });
 

app/Community/Controllers/ApiController.php

@@ -19,6 +19,7 @@ class ApiController extends Controller
     {
         $data['patient_id']= request('patient_id');
         $data['org_id'] = request('org_id');
+        $data['type'] = request('type');
         $is_have = PatientRemark::where($data)->first();
         $data['remark'] = request('remark');
         if($is_have){

app/Community/Controllers/NurseUserController.php

@@ -19,7 +19,7 @@ class NurseUserController extends AdminController
      *
      * @var string
      */
-    protected $title = '用户列表';
+    protected $title = '儿保用户';
 
     /**
      * Make a grid builder.
@@ -34,19 +34,16 @@ class NurseUserController extends AdminController
         if(!$is_amdin){
             $grid->model()->where(['organization_id'=>Admin::user()->org_id,'product_type'=>5]);
         }
-        $grid->model()->GroupBy('patient_id');
-
 
+        $grid->model()->GroupBy('patient_id');
         $grid->column('orderPatient.name', __('姓名'));
         $grid->column('orderUser.nickname', __('监护人'));
         $grid->column('orderPatient.phone', __('监护人手机号'));
         $grid->column('orderPatient.birthday', __('出生日期'));
         $grid->column('patient_id', __('备注'))->display(function ($w){
-            return PatientRemark::where(['org_id'=>Admin::user()->org_id,'patient_id'=>$w])->value('remark');
+            return PatientRemark::where(['org_id'=>intval(Admin::user()->org_id),'patient_id'=>$w,'type'=>1])->value('remark');
         });
 
-
-
         $grid->filter(function ($flter){
             $flter->like('orderPatient.name','请输入用户姓名');
             $flter->like('orderUser.nickname','请输入监护人姓名');
@@ -81,8 +78,9 @@ class NurseUserController extends AdminController
         $form->hidden('patient_id');
         $org_id = Admin::user()->org_id;
         $form->hidden('org_id')->default(intval($org_id));
+        $form->hidden('type')->default(1);
         $form->textarea('remark','备注')->default(function () use ($org_id,$form){
-            return PatientRemark::where(['org_id'=>$org_id,'patient_id'=>$form->model()->patient_id])->value('remark');
+            return PatientRemark::where(['org_id'=>intval($org_id),'patient_id'=>$form->model()->patient_id,'type'=>1])->value('remark');
         });
         return $form;
     }

app/Community/Controllers/VaccineUserController.php

@@ -28,20 +28,17 @@ class VaccineUserController extends AdminController
     {
         $grid = new Grid(new Order());
         $is_amdin = Admin::user()->isRole('administrator');
-
         if(!$is_amdin){
             $grid->model()->where(['organization_id'=>Admin::user()->org_id,'product_type'=>4]);
         }
-        $grid->model()->GroupBy('patient_id');
-
-
 
+        $grid->model()->GroupBy('patient_id');
         $grid->column('orderPatient.name', __('姓名'));
         $grid->column('orderUser.nickname', __('监护人'));
         $grid->column('orderPatient.phone', __('监护人手机号'));
         $grid->column('orderPatient.birthday', __('出生日期'));
         $grid->column('patient_id', __('备注'))->display(function ($w){
-            return PatientRemark::where(['org_id'=>Admin::user()->org_id,'patient_id'=>$w])->value('remark');
+            return PatientRemark::where(['org_id'=>intval(Admin::user()->org_id),'patient_id'=>$w,'type'=>2])->value('remark');
         });
 
         $grid->filter(function ($flter){
@@ -63,23 +60,6 @@ class VaccineUserController extends AdminController
     {
         $show = new Show(Order::findOrFail($id));
 
-        $show->field('id', __('Id'));
-        $show->field('user_id', __('User id'));
-        $show->field('docter_id', __('Docter id'));
-        $show->field('patient_id', __('Patient id'));
-        $show->field('organization_id', __('Organization id'));
-        $show->field('order_sn', __('Order sn'));
-        $show->field('payment_type', __('Payment type'));
-        $show->field('product_type', __('Product type'));
-        $show->field('order_status', __('Order status'));
-        $show->field('payment_status', __('Payment status'));
-        $show->field('total_amount', __('Total amount'));
-        $show->field('payment_amount', __('Payment amount'));
-        $show->field('discount_amount', __('Discount amount'));
-        $show->field('payment_time', __('Payment time'));
-        $show->field('created_at', __('Created at'));
-        $show->field('updated_at', __('Updated at'));
-
         return $show;
     }
 
@@ -92,20 +72,14 @@ class VaccineUserController extends AdminController
     {
         $form = new Form(new Order());
 
-        $form->number('user_id', __('User id'));
-        $form->number('docter_id', __('Docter id'));
-        $form->number('patient_id', __('Patient id'));
-        $form->number('organization_id', __('Organization id'));
-        $form->text('order_sn', __('Order sn'));
-        $form->switch('payment_type', __('Payment type'))->default(1);
-        $form->switch('product_type', __('Product type'))->default(1);
-        $form->switch('order_status', __('Order status'))->default(1);
-        $form->switch('payment_status', __('Payment status'))->default(1);
-        $form->number('total_amount', __('Total amount'));
-        $form->number('payment_amount', __('Payment amount'));
-        $form->number('discount_amount', __('Discount amount'));
-        $form->number('payment_time', __('Payment time'));
-
+        $form->setAction('/cdms/api/paitent_remark');
+        $form->hidden('patient_id');
+        $org_id = Admin::user()->org_id;
+        $form->hidden('org_id')->default(intval($org_id));
+        $form->hidden('type')->default(2);
+        $form->textarea('remark','备注')->default(function () use ($org_id,$form){
+            return PatientRemark::where(['org_id'=>intval($org_id),'patient_id'=>$form->model()->patient_id,'type'=>2])->value('remark');
+        });
         return $form;
     }
 }