From 3a0bee4d584cd13dba47195ea58a9814cd53bada Mon Sep 17 00:00:00 2001 From: ericli1018 Date: Thu, 3 Jul 2025 10:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E7=96=BE=E7=97=85=E9=A1=9E?= =?UTF-8?q?=E5=88=A5=E9=A0=85=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHealthAllowanceCrudController.php | 21 +++++++++++++++++++ .../EventImprovedHealthCrudController.php | 7 ++++--- .../Admin/EventMetabolismCrudController.php | 21 +++++++++++++++++++ .../HealthAllowanceFillFormController.php | 1 + .../MetabolismFillFormController.php | 1 + .../Requests/EventHealthAllowanceRequest.php | 2 ++ app/Http/Requests/EventMetabolismRequest.php | 2 ++ ..._024900_create_event_metabolisms_table.php | 1 + ...9_create_event_health_allowances_table.php | 1 + .../health_allowance_fill_form.blade.php | 17 +++++++++++++++ resources/views/health_literacy.blade.php | 6 ++++++ .../views/improved_health_fill_form.blade.php | 8 ++++++- .../views/metabolism_fill_form.blade.php | 17 +++++++++++++++ 13 files changed, 101 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php b/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php index aa1e656..f709e24 100644 --- a/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php +++ b/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php @@ -53,6 +53,12 @@ class EventHealthAllowanceCrudController extends CrudController 'type' => 'select_from_array', 'options' => ['1' => '未審核 　', '2' => '通過　 〇', '3' => '未通過 ✖', '4' => '重覆資料(僅標記)'], ], + [ + 'name' => 'disease_type', + 'label' => '疾病類別', + 'type' => 'select_from_array', + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）'], + ], [ 'name' => 'hospital_name', 'label' => '就醫院所', @@ -108,6 +114,15 @@ class EventHealthAllowanceCrudController extends CrudController ->whenActive(function($value) { CRUD::addClause('where', 'check_state', $value); }); + CRUD::filter('疾病類別') + ->type('dropdown') + ->values([ + 1 => '代謝症候群（代謝症候群者）', + 5 => '代謝症候群（糖尿病前期者）' + ]) + ->whenActive(function($value) { + CRUD::addClause('where', 'disease_type', $value); + }); CRUD::filter('ID') ->type('text') ->whenActive(function($value) { @@ -173,6 +188,12 @@ class EventHealthAllowanceCrudController extends CrudController { CRUD::setValidation(EventHealthAllowanceRequest::class); $this->crud->addFields([ + [ + 'name' => 'disease_type', + 'label' => '疾病類別', + 'type' => 'select_from_array', + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）'], + ], [ 'name' => 'hospital_name', 'label' => '就醫院所', diff --git a/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php b/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php index 9daedf4..af65fdd 100644 --- a/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php +++ b/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php @@ -56,7 +56,7 @@ class EventImprovedHealthCrudController extends CrudController 'name' => 'disease_type', 'label' => '疾病類別', 'type' => 'select_from_array', - 'options' => ['1' => '代謝症候群', '2' => '糖尿病', '3' => '初期慢性腎臟病', '4' => '糖尿病及初期慢性腎臟病'], + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）', '2' => '糖尿病', '3' => '初期慢性腎臟病', '4' => '糖尿病及初期慢性腎臟病'], ], [ 'name' => 'hospital_name', @@ -115,7 +115,8 @@ class EventImprovedHealthCrudController extends CrudController CRUD::filter('疾病類別') ->type('dropdown') ->values([ - 1 => '代謝症候群', + 1 => '代謝症候群（代謝症候群者）', + 5 => '代謝症候群（糖尿病前期者）', 2 => '糖尿病', 3 => '初期慢性腎臟病', 4 => '糖尿病及初期慢性腎臟病' @@ -198,7 +199,7 @@ class EventImprovedHealthCrudController extends CrudController 'name' => 'disease_type', 'label' => '疾病類別', 'type' => 'select_from_array', - 'options' => ['1' => '代謝症候群', '2' => '糖尿病', '3' => '初期慢性腎臟病', '4' => '糖尿病及初期慢性腎臟病'], + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）', '2' => '糖尿病', '3' => '初期慢性腎臟病', '4' => '糖尿病及初期慢性腎臟病'], ], [ 'name' => 'hospital_name', diff --git a/app/Http/Controllers/Admin/EventMetabolismCrudController.php b/app/Http/Controllers/Admin/EventMetabolismCrudController.php index 4106d54..92d72a3 100644 --- a/app/Http/Controllers/Admin/EventMetabolismCrudController.php +++ b/app/Http/Controllers/Admin/EventMetabolismCrudController.php @@ -53,6 +53,12 @@ class EventMetabolismCrudController extends CrudController 'type' => 'select_from_array', 'options' => ['1' => '未審核 　', '2' => '通過　 〇', '3' => '未通過 ✖', '4' => '重覆資料(僅標記)'], ], + [ + 'name' => 'disease_type', + 'label' => '疾病類別', + 'type' => 'select_from_array', + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）'], + ], [ 'name' => 'hospital_name', 'label' => '就醫院所', @@ -108,6 +114,15 @@ class EventMetabolismCrudController extends CrudController ->whenActive(function($value) { CRUD::addClause('where', 'check_state', $value); }); + CRUD::filter('疾病類別') + ->type('dropdown') + ->values([ + 1 => '代謝症候群（代謝症候群者）', + 5 => '代謝症候群（糖尿病前期者）' + ]) + ->whenActive(function($value) { + CRUD::addClause('where', 'disease_type', $value); + }); CRUD::filter('ID') ->type('text') ->whenActive(function($value) { @@ -174,6 +189,12 @@ class EventMetabolismCrudController extends CrudController { CRUD::setValidation(EventMetabolismRequest::class); $this->crud->addFields([ + [ + 'name' => 'disease_type', + 'label' => '疾病類別', + 'type' => 'select_from_array', + 'options' => ['1' => '代謝症候群（代謝症候群者）', '5' => '代謝症候群（糖尿病前期者）'], + ], [ 'name' => 'hospital_name', 'label' => '就醫院所', diff --git a/app/Http/Controllers/HealthAllowanceFillFormController.php b/app/Http/Controllers/HealthAllowanceFillFormController.php index 5b1582a..0f505ef 100644 --- a/app/Http/Controllers/HealthAllowanceFillFormController.php +++ b/app/Http/Controllers/HealthAllowanceFillFormController.php @@ -125,6 +125,7 @@ class HealthAllowanceFillFormController extends Controller if ($eventItem->check_state == 2) { throw new \Exception('您已經登記審查通過。'); } + $eventItem->disease_type = $request->input('disease_type'); $eventItem->hospital_name = $request->input('hospital_name'); $eventItem->name = $request->input('name'); $eventItem->phone = $request->input('phone'); diff --git a/app/Http/Controllers/MetabolismFillFormController.php b/app/Http/Controllers/MetabolismFillFormController.php index f3ac31f..9f41365 100644 --- a/app/Http/Controllers/MetabolismFillFormController.php +++ b/app/Http/Controllers/MetabolismFillFormController.php @@ -125,6 +125,7 @@ class MetabolismFillFormController extends Controller if ($eventItem->check_state == 2) { throw new \Exception('您已經登記審查通過。'); } + $eventItem->disease_type = $request->input('disease_type'); $eventItem->hospital_name = $request->input('hospital_name'); $eventItem->name = $request->input('name'); $eventItem->phone = $request->input('phone'); diff --git a/app/Http/Requests/EventHealthAllowanceRequest.php b/app/Http/Requests/EventHealthAllowanceRequest.php index 41c218f..c593428 100644 --- a/app/Http/Requests/EventHealthAllowanceRequest.php +++ b/app/Http/Requests/EventHealthAllowanceRequest.php @@ -14,6 +14,7 @@ class EventHealthAllowanceRequest extends FormRequest public function rules() { return [ + 'disease_type' => 'required', 'hospital_name' => 'required|min:2', 'name' => 'required|min:1|max:128', 'twid' => 'required|isNI', @@ -32,6 +33,7 @@ class EventHealthAllowanceRequest extends FormRequest public function attributes() { return [ + 'disease_type' => '疾病類別', 'hospital_name' => '就醫院所', 'name' => '姓名', 'twid' => '身份證字號', diff --git a/app/Http/Requests/EventMetabolismRequest.php b/app/Http/Requests/EventMetabolismRequest.php index 759d95f..eea8cd9 100644 --- a/app/Http/Requests/EventMetabolismRequest.php +++ b/app/Http/Requests/EventMetabolismRequest.php @@ -26,6 +26,7 @@ class EventMetabolismRequest extends FormRequest public function rules() { return [ + 'disease_type' => 'required', 'hospital_name' => 'required|min:2', 'name' => 'required|min:1|max:128', 'twid' => 'required|isNI', @@ -44,6 +45,7 @@ class EventMetabolismRequest extends FormRequest public function attributes() { return [ + 'disease_type' => '疾病類別', 'hospital_name' => '就醫院所', 'name' => '姓名', 'twid' => '身份證字號', diff --git a/database/migrations/2025_05_26_024900_create_event_metabolisms_table.php b/database/migrations/2025_05_26_024900_create_event_metabolisms_table.php index e8ee54b..9ee46c6 100644 --- a/database/migrations/2025_05_26_024900_create_event_metabolisms_table.php +++ b/database/migrations/2025_05_26_024900_create_event_metabolisms_table.php @@ -14,6 +14,7 @@ class CreateEventMetabolismsTable extends Migration { Schema::create('event_metabolisms', function (Blueprint $table) { $table->bigIncrements('id'); + $table->integer('disease_type'); $table->text('hospital_name'); $table->text('name'); $table->text('twid'); diff --git a/database/migrations/2025_05_26_025439_create_event_health_allowances_table.php b/database/migrations/2025_05_26_025439_create_event_health_allowances_table.php index 658ace0..8df5793 100644 --- a/database/migrations/2025_05_26_025439_create_event_health_allowances_table.php +++ b/database/migrations/2025_05_26_025439_create_event_health_allowances_table.php @@ -14,6 +14,7 @@ class CreateEventHealthAllowancesTable extends Migration { Schema::create('event_health_allowances', function (Blueprint $table) { $table->bigIncrements('id'); + $table->integer('disease_type'); $table->text('hospital_name'); $table->text('name'); $table->text('twid'); diff --git a/resources/views/health_allowance_fill_form.blade.php b/resources/views/health_allowance_fill_form.blade.php index d35562a..2a4981f 100644 --- a/resources/views/health_allowance_fill_form.blade.php +++ b/resources/views/health_allowance_fill_form.blade.php @@ -34,6 +34,23 @@ @endif
+
+ +
+
+ + +
+
+ + +
+
+
diff --git a/resources/views/health_literacy.blade.php b/resources/views/health_literacy.blade.php index 8a40ef6..cbbd44b 100644 --- a/resources/views/health_literacy.blade.php +++ b/resources/views/health_literacy.blade.php @@ -14,6 +14,12 @@
+

【健康知識學起來 輕鬆領取桃園幣活動額滿公告】

+

+ 感謝各位的熱情參與，本項活動反應熱烈，目前兌換名額已全數額滿！敬請持續關注後續活動資訊，謝謝您的支持與配合！ +

+

 

+

健康識能有獎徵答活動

為提升市民慢性病防治識能， diff --git a/resources/views/improved_health_fill_form.blade.php b/resources/views/improved_health_fill_form.blade.php index ca15329..18d4eec 100644 --- a/resources/views/improved_health_fill_form.blade.php +++ b/resources/views/improved_health_fill_form.blade.php @@ -40,7 +40,13 @@

+
+
+ +
diff --git a/resources/views/metabolism_fill_form.blade.php b/resources/views/metabolism_fill_form.blade.php index 283746c..3397c2a 100644 --- a/resources/views/metabolism_fill_form.blade.php +++ b/resources/views/metabolism_fill_form.blade.php @@ -36,6 +36,23 @@ @endif
+
+ +
+
+ + +
+
+ + +
+
+