調整疾病類別項目

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' => '就醫院所',

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',

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' => '就醫院所',

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');

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');

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' => '身份證字號',

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' => '身份證字號',

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');

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');

resources/views/health_allowance_fill_form.blade.php

@@ -34,6 +34,23 @@
                 @endif
                 <div class="card">
                     <div class="card-body">
+                        <div class="mb-3">
+                            <label class="form-label">疾病類別</label>
+                            <div class="form-control" >
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="disease_type" id="diseaseType1" value="1" {{ old('disease_type') == "1" ? 'checked' : '' }} required>
+                                    <label class="form-check-label" for="diseaseType1">
+                                        代謝症候群（代謝症候群者）
+                                    </label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="disease_type" id="diseaseType5" value="5" {{ old('disease_type') == "5" ? 'checked' : '' }} required>
+                                    <label class="form-check-label" for="diseaseType5">
+                                        代謝症候群（糖尿病前期者）
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
                         <div class="mb-3">
                             <label for="regHospitalName" class="form-label">就醫院所</label>
                             <input type="text" class="form-control" id="regHospitalName" name="hospital_name" required value="{{ old('hospital_name') }}" placeholder="範例：XX醫院">

resources/views/health_literacy.blade.php

@@ -14,6 +14,12 @@
 
     <div class="row justify-content-center">
         <div class="col-md-8 main-area">
+            <h3 style="color: brown">【健康知識學起來 輕鬆領取桃園幣活動額滿公告】</h3>
+            <p>
+                感謝各位的熱情參與，本項活動反應熱烈，目前兌換名額已全數額滿！敬請持續關注後續活動資訊，謝謝您的支持與配合！
+            </p>
+            <p>&nbsp;</p>
+            
             <h3>健康識能有獎徵答活動</h3>
             <p>
                 為提升市民慢性病防治識能， 

resources/views/improved_health_fill_form.blade.php

@@ -40,7 +40,13 @@
                                 <div class="form-check">
                                     <input class="form-check-input" type="radio" name="disease_type" id="diseaseType1" value="1" {{ old('disease_type') == "1" ? 'checked' : '' }} required>
                                     <label class="form-check-label" for="diseaseType1">
-                                        代謝症候群
+                                        代謝症候群（代謝症候群者）
+                                    </label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="disease_type" id="diseaseType5" value="5" {{ old('disease_type') == "5" ? 'checked' : '' }} required>
+                                    <label class="form-check-label" for="diseaseType5">
+                                        代謝症候群（糖尿病前期者）
                                     </label>
                                 </div>
                                 <div class="form-check">

resources/views/metabolism_fill_form.blade.php

@@ -36,6 +36,23 @@
                 @endif
                 <div class="card">
                     <div class="card-body">
+                        <div class="mb-3">
+                            <label class="form-label">疾病類別</label>
+                            <div class="form-control" >
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="disease_type" id="diseaseType1" value="1" {{ old('disease_type') == "1" ? 'checked' : '' }} required>
+                                    <label class="form-check-label" for="diseaseType1">
+                                        代謝症候群（代謝症候群者）
+                                    </label>
+                                </div>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="disease_type" id="diseaseType5" value="5" {{ old('disease_type') == "5" ? 'checked' : '' }} required>
+                                    <label class="form-check-label" for="diseaseType5">
+                                        代謝症候群（糖尿病前期者）
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
                         <div class="mb-3">
                             <label for="regHospitalName" class="form-label">就醫院所</label>
                             <input type="text" class="form-control" id="regHospitalName" name="hospital_name" required value="{{ old('hospital_name') }}" placeholder="範例：XX醫院">