diff --git a/api/application/config/customconfig_one.php b/api/application/config/customconfig_one.php
index 242d2262..2a63ef29 100644
--- a/api/application/config/customconfig_one.php
+++ b/api/application/config/customconfig_one.php
@@ -49,7 +49,7 @@ $config['authorization_key'] = 'sparqvenba2018';
 /* End of file jwt.php */
 /* Location: ./application/config/jwt.php */
 
-$config['master_tables_field_names'] = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'enduse_of_loan','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name','PDAPPLICANTSDETAILS'=>'applicant_name','RELATIONWITHBUSINESS'=>'relation_with_business_name','BUSINESSENTITYTYPE'=>'business_entity_type_name','COMPANYRELATIONSHIPS'=>'name','STATE'=>'name','CITY'=>'name','COUNTRY'=>'country_name','BOUNCEMASTER'=>'bounce_reason_name','BUSINESSEXPENSES'=>'expense_item','BUSINESSINCOME'=>'business_income_item','COMMENTSONLOCALITY'=>'rating','COMPANY'=>'company_id','LOCALITY'=>'locality_name','NONINDIVIDUALENTITIES'=>'non_individual_entity_name','PDFORMS'=>'pd_form_name','PDLOCATIONAPPROACH'=>'description','PDTYPE'=>'type_name','PDNOTIFICATION'=>'pd_status','QUESTIONCATEGORY'=>'category_name','ROLES'=>'role_name','SUBPRODUCTS'=>'name','TITLES'=>'name','PINCODE'=>'pincode','PRODUCTS'=>'name','ENTITYTYPE'=>'name','PDTEAM'=>'team_name','ENTITY'=>'short_name','PDSTATUS'=>'pd_status_name','LISTOFMASTERS'=>'master_name','OTPREJECTION'=>'rejection_reason','ENDUSEOFTOPUP'=>'end_use_of_topup','VEHICLETYPE'=>'vehicle_type_name','PDOFFICERRECOMMENDATIONS'=>'pdoffficer_recommandation');
+$config['master_tables_field_names'] = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'enduse_of_loan','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name','PDAPPLICANTSDETAILS'=>'applicant_name','RELATIONWITHBUSINESS'=>'relation_with_business_name','BUSINESSENTITYTYPE'=>'business_entity_type_name','COMPANYRELATIONSHIPS'=>'name','STATE'=>'name','CITY'=>'name','COUNTRY'=>'country_name','BOUNCEMASTER'=>'bounce_reason_name','BUSINESSEXPENSES'=>'expense_item','BUSINESSINCOME'=>'business_income_item','COMMENTSONLOCALITY'=>'rating','COMPANY'=>'company_id','LOCALITY'=>'locality_name','NONINDIVIDUALENTITIES'=>'non_individual_entity_name','PDFORMS'=>'pd_form_name','PDLOCATIONAPPROACH'=>'description','PDTYPE'=>'type_name','PDNOTIFICATION'=>'pd_status','QUESTIONCATEGORY'=>'category_name','ROLES'=>'role_name','SUBPRODUCTS'=>'name','TITLES'=>'name','PINCODE'=>'pincode','PRODUCTS'=>'name','ENTITYTYPE'=>'name','PDTEAM'=>'team_name','ENTITY'=>'short_name','PDSTATUS'=>'pd_status_name','LISTOFMASTERS'=>'master_name','OTPREJECTION'=>'rejection_reason','ENDUSEOFTOPUP'=>'end_use_of_topup','VEHICLETYPE'=>'vehicle_type_name','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation');
 
 $config['master_tables_pkid'] = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'enduse_of_loan_id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'existing_loan_type_id','PDAPPLICANTSDETAILS'=>'pd_co_applicant_id','RELATIONWITHBUSINESS'=>'relation_with_business_id','BUSINESSENTITYTYPE'=>'business_entity_type_id','COMPANYRELATIONSHIPS'=>'company_relationship_id','STATE'=>'state_id','CITY'=>'city_id','COUNTRY'=>'country_id','BOUNCEMASTER'=>'bounce_id','BUSINESSEXPENSES'=>'expense_item_id','BUSINESSINCOME'=>'business_income_id','COMMENTSONLOCALITY'=>'comments_on_locality_id','COMPANY'=>'name','LOCALITY'=>'locality_id','NONINDIVIDUALENTITIES'=>'non_individual_entity_id','PDFORMS'=>'form_id','PDLOCATIONAPPROACH'=>'pd_location_approach_id','PDTYPE'=>'pd_type_id','PDNOTIFICATION'=>'pdnotification_id','QUESTIONCATEGORY'=>'question_category_id','ROLES'=>'role_id','SUBPRODUCTS'=>'subproduct_id','TITLES'=>'title_id','PINCODE'=>'pincode_id','PRODUCTS'=>'product_id','ENTITYTYPE'=>'entity_type_id','PDTEAM'=>'pdteam_id','ENTITY'=>'entity_id','PDSTATUS'=>'pd_status_id','LISTOFMASTERS'=>'master_id','OTPREJECTION'=>'otp_rejection_id','ENDUSEOFTOPUP'=>'end_use_of_topup_id','VEHICLETYPE'=>'vehicle_type_id','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation_id');
 ?>
\ No newline at end of file
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 095f697d..71d24e2d 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -2250,7 +2250,7 @@ class PD_Controller extends REST_Controller {
 					// $processed_json = GETPROCESSEDJSON::convertNeighbourDetailsForm($records,$formid);
 					// break;
 			// case 20: 
-				  // $processed_json = $records;	
+				  // $processed_json = $processed_json = GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid);
 				  // break;
 				  
 			// case 22: 
@@ -2259,9 +2259,9 @@ class PD_Controller extends REST_Controller {
 				  
 			// //default:
 					// //echo "Something Wrong! Form ID did not match, Contact System Administrator";
-		// }
+		 // }
 		
-		 //die();
+		 // die();
 		/*****End of Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA*******/
 		
 		unset($records['pdid']);
@@ -2417,26 +2417,26 @@ class PD_Controller extends REST_Controller {
 								
 							}
 							
-							if($new_applicant['is_new'] == false)
-							{
-									$temp_array = array();
-									$where_condition_array = array('fk_pd_id'=>$records['pdid']);
-									if($new_applicant['is_person_met'] == true)
-									{
-										$temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>3,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
-									}
+							// if($new_applicant['is_new'] == false)
+							// {
+									// $temp_array = array();
+									// $where_condition_array = array('fk_pd_id'=>$records['pdid']);
+									// if($new_applicant['is_person_met'] == true)
+									// {
+										// $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>3,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
+									// }
 									
-									if($new_applicant['is_applicant'] == true)
-									{
-										$temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>0,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
-									}
+									// if($new_applicant['is_applicant'] == true)
+									// {
+										// $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>0,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
+									// }
 									
-									if($new_applicant['is_main_applicant'] == true)
-									{
-										$temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>1,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
-									}
-									$new_co_appliacant_id = $this->PD_Model->updateRecords($temp_array,PDAPPLICANTSDETAILS,$where_condition_array);
-							}
+									// if($new_applicant['is_main_applicant'] == true)
+									// {
+										// $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>1,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
+									// }
+									// $new_co_appliacant_id = $this->PD_Model->updateRecords($temp_array,PDAPPLICANTSDETAILS,$where_condition_array);
+							// }
 							
 							if(array_key_exists('is_active',$new_applicant))
 							{
@@ -4089,7 +4089,7 @@ class PD_Controller extends REST_Controller {
 		{
 			$is_regenerate = 1;	
 		}
-		
+		//print_r($records);die();
 		$data['pd_master_details'] = $this->PD_Model->getPDMasterDetails($pdid);
 		$data['applicants_details'] = $this->PD_Model->getApplicantsDetails($pdid);
 		$data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid);
@@ -4097,7 +4097,7 @@ class PD_Controller extends REST_Controller {
 			//GET ALL PROCESSED JSON
 			for($i = 1;$i<=20;$i++)
 			{	
-				$fields = array('processed_json');
+				$fields = array('json','processed_json');
 				 $where_condition_array = array('isactive' => 1,'fk_pd_id'=>$pdid,'fk_form_id' => $i);
 				 // if($company_id != null)
 					// {
@@ -4105,7 +4105,7 @@ class PD_Controller extends REST_Controller {
 					// }
 			   $data['pd_processed_forms'][$i] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
 			}
-		print_r($data['pd_processed_forms']);
+		print_r($data['pd_processed_forms']);die();
 		// print_r(json_decode($data['pd_processed_forms'][13][0]['processed_json'],true));
 		// echo count($data['pd_processed_forms'][1]);
 	  
@@ -4202,7 +4202,18 @@ class PD_Controller extends REST_Controller {
 	{
 		 $records = $this->post('records');
 		 $pd_id = $records['pd_id'];
-		
+		 $ai_flag = 0;
+		 //GET TEMPALE ID FROM MASTER
+		 $pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id);
+		 //print_r($pd_master_details[0]['customer_segment_abbr']);
+		 $str =  substr($pd_master_details[0]['customer_segment_abbr'],-2);
+		 //echo $str;
+		 if(!strcmp($str,'AI')) { $ai_flag = 1; }
+		 //echo $ai_flag;
+		 //USING TEMPLATE ID , GET ASSESSED INCOME ASSIGNED OR NOT
+		 $fields = array('*');
+		 $where_condition_array = array('isactive' => 1,'form_id'=> 16,'fk_template_id' =>$pd_master_details[0]['fk_pd_template_id'] );
+		 $rec = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATEFORMS);	
 		 
 		 $company_list = array();
 		 $fields = array('json');
@@ -4223,8 +4234,10 @@ class PD_Controller extends REST_Controller {
 			 }
 			 // $company_list = array( array('company_order_id' => 1));
 			 //print_r($company_list);
-			 foreach($company_list as $list_key => $company)
-			 {
+			  $form_array = array();
+			  if($ai_flag == 0) // DI case
+			  {
+				 // echo "DI";
 				 $form_array = array(
 										array('form_id' => 13,'form_name' => 'About Business'),
 										array('form_id' => 22,'form_name' => 'Business Assets'),
@@ -4234,7 +4247,25 @@ class PD_Controller extends REST_Controller {
 										array('form_id' => 2,'form_name' => 'Client Details'),
 										array('form_id' => 11,'form_name' => 'Stock Details'),
 										
-									);
+									); 
+			  }
+			  else // AI Case
+			  {
+				 // echo "AI";
+				 $form_array = array(
+										array('form_id' => 13,'form_name' => 'About Business'),
+										array('form_id' => 22,'form_name' => 'Business Assets'),
+										array('form_id' => 21,'form_name' => 'Business Banking'),
+										array('form_id' => 16,'form_name' => 'Assessed Income'),
+										array('form_id' => 1,'form_name' => 'Supplier Details'),
+										array('form_id' => 2,'form_name' => 'Client Details'),
+										array('form_id' => 11,'form_name' => 'Stock Details'),
+										
+									); 
+			  }
+			 foreach($company_list as $list_key => $company)
+			 {
+				 
 					$temp = array();	
 					$business_form_status = 0;	
 					$supplier_form_status = 0;	
diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php
index 043d8c26..6c8ebd99 100644
--- a/api/application/helpers/getprocessedjson_helper.php
+++ b/api/application/helpers/getprocessedjson_helper.php
@@ -1294,6 +1294,55 @@ class GETPROCESSEDJSON
 	
 		}
 	/*****************##########   END OF ADDRESS FORM DETAILS  ##########**************/
+	
+	
+	
+	/*****************##########   FINAL REMARKS FORM DETAILS  ##########**************/
+	public static function convertFinalRemarksForm($raw_json,$formid)
+	{
+			$CI =& get_instance();
+			$master_tables_field_names = $CI->config->item('master_tables_field_names');
+			$master_tables_pkid = $CI->config->item('master_tables_pkid');
+		
+		//print_r($raw_json);
+		
+			// GET KEYS FROM MASTER TABLE FOR SUPPLIER FORM
+			$fields = array('question', 'key', 'ismaster', 'master_name');
+			$where_condition_array = array('fk_form_id' => $formid,'isactive' => 1);
+			$master_keys = $CI->PD_Model->selectCustomRecords($fields,$where_condition_array,QUESTIONKEYMAPPING);
+			
+			
+			if(array_key_exists('final_custormer_remark_type',$raw_json))
+			{
+					$CI->db->SELECT( $master_tables_field_names['CUSTOMERBEHAVIOUR'] );
+					$CI->db->FROM(CUSTOMERBEHAVIOUR);
+					$CI->db->WHERE('isactive',1);
+					$CI->db->WHERE($master_tables_pkid['CUSTOMERBEHAVIOUR'] ,$raw_json['final_custormer_remark_type']);
+					$customer_behaviour= $CI->db->GET()->result_array();
+					//print_r($CI->db->last_query());
+					if(count($customer_behaviour))
+						{
+							$raw_json['final_custormer_remark_type_master'] = $customer_behaviour[0][$master_tables_field_names['CUSTOMERBEHAVIOUR']];
+						}	
+			}
+			
+			if(array_key_exists('pd_officers_recommendation',$raw_json))
+			{
+					$CI->db->SELECT( $master_tables_field_names['PDOFFICERRECOMMENDATIONS'] );
+					$CI->db->FROM(PDOFFICERRECOMMENDATIONS);
+					$CI->db->WHERE('is_active',1);
+					$CI->db->WHERE($master_tables_pkid['PDOFFICERRECOMMENDATIONS'] ,$raw_json['pd_officers_recommendation']);
+					$pdofficer_recommendations= $CI->db->GET()->result_array();
+					//print_r($CI->db->last_query());
+					if(count($pdofficer_recommendations))
+						{
+							$raw_json['pd_officers_recommendation_master'] = $pdofficer_recommendations[0][$master_tables_field_names['PDOFFICERRECOMMENDATIONS']];
+						}	
+			}
+			
+			return $raw_json;
+	}
+	/*****************##########   END OF FINAL REMARKS FORM DETAILS  ##########**************/
 }