diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php
index 9a82092..4b039ca 100644
--- a/public/userarea/importify/check_vocabulary.php
+++ b/public/userarea/importify/check_vocabulary.php
@@ -42,16 +42,28 @@ if(isset($_FILES['f_csv'])) {
             array_push($arr_need_columns, $reportsNumberLab_excelName);
             array_push($arr_need_columns, $partsCode_excelName);
 
+            $result_groupNameHeaderFile = "";    //for analysisgroupcode
             $result_testNameHeaderFile = "";    //for analysisvocabulary
+            $result_CasNameHeaderFile = "";    //for compundsvocabulary
             $result_AnalytsNameHeaderFile = "";    //for compundsvocabulary
 
+
             foreach($arr_associate as $item) {
                 array_push($arr_need_columns, $item['headerfile']);
 
+                if($item['column_name'] == 'analysisgroupcode'){
+                    $result_groupNameHeaderFile = $item['headerfile'];
+                }
+
                 if($item['column_name'] == 'result_TestName') {
                     $result_testNameHeaderFile = $item['headerfile'];
                 }
 
+                
+                if($item['column_name'] == 'cas'){
+                    $result_CasNameHeaderFile = $item['headerfile'];
+                }
+
                 if($item['column_name'] == 'result_AnalytsName') {
                     $result_AnalytsNameHeaderFile = $item['headerfile'];
                 }
@@ -72,19 +84,30 @@ if(isset($_FILES['f_csv'])) {
                 if($result_testNameHeaderFile != "") {
                     $arr_diff_anaysisvoc_words = array();
                     $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns);
+                    $idx_groupCodeHeaderFile = array_search($result_groupNameHeaderFile, $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]);                        
+                            array_push($arr_diff_anaysisvoc_words, 
+                            array(
+                                "word"=>$arr_info[$i][$idx_resultTestName_po],
+                                "groupcode"=> $arr_info[$i][$idx_groupCodeHeaderFile],
+                            ));                        
                         }
                     }
 
                     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'");
+                        $trim_item = str_replace("\n", "", str_replace("'", "\'", $item['word']));
+                        $groupcodeTrimmed = str_replace("\n", "", str_replace("'", "\'", $item['groupcode']));
+                        $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where analysiscode like '$groupcodeTrimmed'");
                         $arr_analysis_refdata->execute();
                         $arr_analysis_ref = $arr_analysis_refdata->Results;
+                        if($arr_analysis_ref > 0){
+                            $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);
@@ -92,7 +115,7 @@ if(isset($_FILES['f_csv'])) {
                             $arr_analysiskind_refdata->execute();
                             $arr_analysiskind_ref = $arr_analysiskind_refdata->Results;
                             array_push($arr_anaysisvoc_words, array(
-                                'word' => $item,
+                                'word' => $item['word'],
                                 'arr_similary' => $arr_analysiskind_ref
                             ));
                         }
@@ -105,6 +128,7 @@ if(isset($_FILES['f_csv'])) {
                     $arr_diff_compundsvoc_words = array();
                     $arr_tmp_diff_compundsvoc_words = array();
                     $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns);
+                    $idx_resultAnalytsName_cas = array_search($result_CasNameHeaderFile, $arr_excel_columns);
                     $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0;
                     
                     for($i=1; $i<count($arr_info); $i++) {
@@ -112,18 +136,25 @@ if(isset($_FILES['f_csv'])) {
                             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],
+                                'cas' => $arr_info[$i][$idx_resultAnalytsName_cas],
                                 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : ""
                             ));                        
                         }
                     }
 
-                    foreach($arr_diff_compundsvoc_words as $item) {
+                    foreach($arr_diff_compundsvoc_words as $item) { 
                         $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0);
                         $compund_word = $item['word'];
+                        $compund_cas = $item['cas'];
                         $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->setQuery("SELECT * FROM compundsvocabulary where cascompoundvocabulary like '%$compund_cas%'");
                         $arr_compunds_refdata->execute();
                         $arr_compunds_ref = $arr_compunds_refdata->Results;
+                        if($arr_compunds_ref > 0 ){
+                            $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);
@@ -136,7 +167,7 @@ if(isset($_FILES['f_csv'])) {
                                 'arr_similary' => $arr_compundskind_ref
                             ));
                         }
-                    }
+                    } 
                 }
 
                 die(json_encode(array(
diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php
index eaec4d9..350d994 100644
--- a/public/userarea/importify/importify_bg_script.php
+++ b/public/userarea/importify/importify_bg_script.php
@@ -227,7 +227,7 @@ foreach ($arr_total_products as $product) {
                             
                             $trim_group_code = str_replace("\n", "", str_replace("'", "\'", $group_code_val));
                             $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0);
-                            $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '%$trim_group_code%'");
+                            $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '$trim_group_code'");
                             $analysis_query->execute();
 
                             $analysis_data = $analysis_query->Results;