diff --git a/frontend/modules/report/views/case/search-pap.php b/frontend/modules/report/views/case/search-pap.php
index 91966557..423a4b8f 100644
--- a/frontend/modules/report/views/case/search-pap.php
+++ b/frontend/modules/report/views/case/search-pap.php
@@ -34,7 +34,14 @@ $this->params['breadcrumbs'][] = $this->title;
                 'model' => $searchModel,
                 'theme' => Select2::THEME_BOOTSTRAP,
                 'attribute' => 'specimen_adequacy_1',
-                'data' => ArrayHelper::map(CytoSpecimenAdequacy1::find()->all(), 'id', 'name'),
+                'data' => ArrayHelper::map(
+                    CytoSpecimenAdequacy1::find()
+                        ->where(['status' => 1])
+                        ->andWhere(['type' => 'pap'])
+                        ->all(),
+                    'id',
+                    'name'
+                ),
                 'options' => ['placeholder' => 'เลือก Specimen Adequacy 1...'],
                 'pluginOptions' => [
                     'allowClear' => true,
@@ -122,9 +129,6 @@ $this->params['breadcrumbs'][] = $this->title;
         'adequacy_other',
         [
             'attribute' => 'general_categorization_1',
-            'label' => 'General Categorization 1',
-            'format' => 'raw',
-            //'filter' => ArrayHelper::map(CytoGeneralCategorization1::find()->all(), 'id', 'name'),
             'filter' => Select2::widget([
                 'model' => $searchModel,
                 'theme' => Select2::THEME_BOOTSTRAP,
@@ -137,17 +141,16 @@ $this->params['breadcrumbs'][] = $this->title;
             ]),
             'filterInputOptions' => ['id' => null], // ป้องกัน id ซ้ำใน grid หลายแถว
             'value' => function ($model) {
-                if (!empty($model->general_categorization_1) && is_array($model->general_categorization_1)) {
-                    $gc1 = '<ul>';
-                    foreach ($model->general_categorization_1 as $general) {
-                        $general1 = CytoGeneralCategorization1::find()->where(['id' => $general])->one();
-                        $gc1 .= '<li>'  . $general1->name . '</li>';
-                    }
-                    $gc1 .= '</ul>';
-                    return $gc1;
-                } else {
-                    return '';
-                }
+            $generals1 = CytoGeneralCategorization1::find()
+                //->where(['type' => 'pap'])
+                ->all();
+
+            $generalMap1 = [];
+            foreach ($generals1 as $general1) {
+                $generalMap1[$general1->id] =  $general1->name;
+            }
+
+            return isset($generalMap1[$model->general_categorization_1]) ? $generalMap1[$model->general_categorization_1] : '';
             }
         ],
         [