diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php
index 587fc38..bf7d11c 100644
--- a/public/userarea/importify/check_vocabulary.php
+++ b/public/userarea/importify/check_vocabulary.php
@@ -50,6 +50,14 @@ if(isset($_FILES['f_csv'])) {
 
                 if($item['column_name'] == 'result_TestName') {
                     $result_testNameHeaderFile = $item['headerfile'];
+                } 
+
+                if($item['column_name'] == 'analysisgroupcode') {
+                    $result_AnalytsGroupCodeHeaderFile = $item['headerfile'];
+                }
+
+                if($item['column_name'] == 'cas') {
+                    $result_CASHeaderFile = $item['headerfile'];
                 }
 
                 if($item['column_name'] == 'result_AnalytsName') {
@@ -66,79 +74,135 @@ if(isset($_FILES['f_csv'])) {
                 }
             }
 
+            $arr_analysis_code = array();
+            $arr_anaysisvoc_words = array();    
             if($verify_flag) {
-                //check result_TestName field
-                $arr_anaysisvoc_words = array();
-                if($result_testNameHeaderFile != "") {
-                    $arr_diff_anaysisvoc_words = array();
-                    $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns);
-
+                // check analysis code 
+                if($result_AnalytsGroupCodeHeaderFile != ""){
+                    $arr_diff_analysis_code = array();
+                    $idx_resultAnalytsGroupCode_po = array_search($result_AnalytsGroupCodeHeaderFile, $arr_excel_columns);
                     for($i=1; $i<count($arr_info); $i++) {
-                        if(!in_array($arr_info[$i][$idx_resultTestName_po], $arr_diff_anaysisvoc_words)) {
-                            array_push($arr_diff_anaysisvoc_words, $arr_info[$i][$idx_resultTestName_po]);                        
+                        if(!in_array($arr_info[$i][$idx_resultAnalytsGroupCode_po], $arr_diff_analysis_code)) {
+                            array_push($arr_diff_analysis_code, $arr_info[$i][$idx_resultAnalytsGroupCode_po]);
                         }
                     }
 
-                    foreach($arr_diff_anaysisvoc_words as $item) {
+                    foreach($arr_diff_analysis_code as $item) {
                         $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
                         $trim_item = str_replace("\n", "", str_replace("'", "\'", $item));
-                        $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'");
+                        $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where analysiscode like '%$trim_item%'");
                         $arr_analysis_refdata->execute();
                         $arr_analysis_ref = $arr_analysis_refdata->Results;
                         if(count($arr_analysis_ref) == 0) {
-                            //check kind
-                            $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
-                            $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like 'Y'");
-                            $arr_analysiskind_refdata->execute();
-                            $arr_analysiskind_ref = $arr_analysiskind_refdata->Results;
-                            array_push($arr_anaysisvoc_words, array(
-                                'word' => $item,
-                                'arr_similary' => $arr_analysiskind_ref
-                            ));
+                            array_push($arr_analysis_code, $item);
+                        }
+                    } 
+                } 
+
+                // if array $arr_analysis_code is empty
+                if(count($arr_analysis_code) == 0 && $result_testNameHeaderFile != "") { 
+                    //check result_TestName field
+                    if($result_testNameHeaderFile != "") {
+                        $arr_diff_anaysisvoc_words = array();
+                        $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns);
+
+                        for($i=1; $i<count($arr_info); $i++) {
+                            if(!in_array($arr_info[$i][$idx_resultTestName_po], $arr_diff_anaysisvoc_words)) {
+                                array_push($arr_diff_anaysisvoc_words, $arr_info[$i][$idx_resultTestName_po]);                        
+                            }
+                        }
+
+                        foreach($arr_diff_anaysisvoc_words as $item) {
+                            $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
+                            $trim_item = str_replace("\n", "", str_replace("'", "\'", $item));
+                            $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'");
+                            $arr_analysis_refdata->execute();
+                            $arr_analysis_ref = $arr_analysis_refdata->Results;
+                            if(count($arr_analysis_ref) == 0) {
+                                //check kind
+                                $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
+                                $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'");
+                                $arr_analysiskind_refdata->execute();
+                                $arr_analysiskind_ref = $arr_analysiskind_refdata->Results;
+                                array_push($arr_anaysisvoc_words, array(
+                                    'word' => $item,
+                                    'arr_similary' => $arr_analysiskind_ref
+                                ));
+                            }
                         }
                     }
                 }
 
-                //check result_AnalytsName field
-                $arr_compundsvoc_words = array();
-                if($result_AnalytsNameHeaderFile != "") {
-                    $arr_diff_compundsvoc_words = array();
-                    $arr_tmp_diff_compundsvoc_words = array();
-                    $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns);
-                    $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0;
-                    
+                
+
+                // check cas code
+                $arr_cas_code = array();
+                if($result_CASHeaderFile != ""){
+                    $arr_diff_cas_code = array();
+                    $idx_resultCAS_po = array_search($result_CASHeaderFile, $arr_excel_columns);
                     for($i=1; $i<count($arr_info); $i++) {
-                        if(!in_array($arr_info[$i][$idx_resultAnalytsName_po], $arr_tmp_diff_compundsvoc_words)) {
-                            array_push($arr_tmp_diff_compundsvoc_words, $arr_info[$i][$idx_resultAnalytsName_po]);
-                            array_push($arr_diff_compundsvoc_words, array(
-                                'word' => $arr_info[$i][$idx_resultAnalytsName_po],
-                                'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : ""
-                            ));                        
+                        if(!in_array($arr_info[$i][$idx_resultCAS_po], $arr_diff_cas_code)) {
+                            array_push($arr_diff_cas_code, $arr_info[$i][$idx_resultCAS_po]);
                         }
                     }
 
-                    foreach($arr_diff_compundsvoc_words as $item) {
-                        $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
-                        $compund_word = $item['word'];
-                        $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word));
-                        $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'");
-                        $arr_compunds_refdata->execute();
-                        $arr_compunds_ref = $arr_compunds_refdata->Results;
-                        if(count($arr_compunds_ref) == 0) {
-                            //check kind
-                            $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
-                            $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like 'Y'");
-                            $arr_compundskind_refdata->execute();
-                            $arr_compundskind_ref = $arr_compundskind_refdata->Results;
-                            array_push($arr_compundsvoc_words, array(
-                                'word' => $compund_word,
-                                'anaysis_word' => $item['analysis_word'],
-                                'arr_similary' => $arr_compundskind_ref
-                            ));
+                    foreach($arr_diff_cas_code as $item) {
+                        $arr_cas_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
+                        $trim_item = str_replace("\n", "", str_replace("'", "\'", $item));
+                        $arr_cas_refdata->setQuery("SELECT * FROM compundsvocabulary where cascompoundvocabulary like '%$trim_item%'");
+                        $arr_cas_refdata->execute();
+                        $arr_cas_ref = $arr_cas_refdata->Results;
+                        if(count($arr_cas_ref) == 0) {
+                            array_push($arr_cas_code, $item);
+                        }
+                    }  
+                }
+
+                // if array $arr_cas_code is empty
+                if(count($arr_cas_code) == 0 && $result_AnalytsNameHeaderFile != "") {
+                    //check result_AnalytsName field
+                    $arr_compundsvoc_words = array();
+                    if($result_AnalytsNameHeaderFile != "") {
+                        $arr_diff_compundsvoc_words = array();
+                        $arr_tmp_diff_compundsvoc_words = array();
+                        $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns);
+                        $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0;
+                        
+                        for($i=1; $i<count($arr_info); $i++) {
+                            if(!in_array($arr_info[$i][$idx_resultAnalytsName_po], $arr_tmp_diff_compundsvoc_words)) {
+                                array_push($arr_tmp_diff_compundsvoc_words, $arr_info[$i][$idx_resultAnalytsName_po]);
+                                array_push($arr_diff_compundsvoc_words, array(
+                                    'word' => $arr_info[$i][$idx_resultAnalytsName_po],
+                                    'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : ""
+                                ));                        
+                            }
+                        }
+
+                        foreach($arr_diff_compundsvoc_words as $item) {
+                            $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
+                            $compund_word = $item['word'];
+                            $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word));
+                            $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '%$trim_item%' or cascompoundvocabulary like '%$trim_item%'");
+                            $arr_compunds_refdata->execute();
+                            $arr_compunds_ref = $arr_compunds_refdata->Results;
+                            if(count($arr_compunds_ref) == 0) {
+                                //check kind
+                                $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
+                                $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'");
+                                $arr_compundskind_refdata->execute();
+                                $arr_compundskind_ref = $arr_compundskind_refdata->Results;
+                                array_push($arr_compundsvoc_words, array(
+                                    'word' => $compund_word,
+                                    'anaysis_word' => $item['analysis_word'],
+                                    'arr_similary' => $arr_compundskind_ref
+                                ));
+                            }
                         }
                     }
                 }
 
+                
+
                 die(json_encode(array(
                     'code' => "success",
                     'arr_analysis_data' => $arr_anaysisvoc_words,