diff --git a/api/application/controllers/Data_Dump_Controller.php b/api/application/controllers/Data_Dump_Controller.php
index 739406a2..0095beb9 100644
--- a/api/application/controllers/Data_Dump_Controller.php
+++ b/api/application/controllers/Data_Dump_Controller.php
@@ -148,6 +148,11 @@ class Data_Dump_Controller extends REST_Controller {
 				$pd_details['fk_lender_id']=$fk_lender_id;
 				$pd_details['sub_entity_id']=$fk_lender_id;
 				log_message('ERROR',"G-Sheet For PD Step 2.1 (First Cell lender/casebookedin) GSheet data : ".$GSdata["LenderName"]." PD :".$pd_details['fk_lender_id']." ".$pd_details['sub_entity_id']);
+				$lender_contact_persons = $this->PD_Model->getLenderContactPersons($fk_lender_id,null);
+				if(!empty($lender_contact_persons)){
+					$pd_details['lender_credit_person'] = $lender_contact_persons[0]['role_type'] == "CREDIT" ? $lender_contact_persons[0]['userid'] : null;
+					$pd_details['lender_sales_person'] = $lender_contact_persons[0]['role_type'] == "SALES" ? $lender_contact_persons[0]['userid'] : null;
+				}
 			}
 			if(isset($GSdata["LAN"]) && $GSdata["LAN"] != ""){
 				$LAN = trim(str_replace(" ", "", $GSdata["LAN"]));
@@ -184,7 +189,7 @@ class Data_Dump_Controller extends REST_Controller {
 				$NormalParts = explode(',', $GSdata["PDLocation"]);
 				$stateAndPincode = end($NormalParts);
 				$splitStateAndPincode = explode('-',$stateAndPincode , 2);
-				$addresses['fk_state']=$this->Data_Dump_Model->getId(5,trim($splitStateAndPincode[0]));
+				$addresses['fk_state']=$this->Data_Dump_Model->getId(5,$splitStateAndPincode[0]);
 				$pd_details['fk_state'] =$addresses['fk_state'];
 				$pin = $this->Data_Dump_Model->getId(6,trim($splitStateAndPincode[1]));
 				$addresses['pincode'] = ($pin != "" ? $pin : 1);
@@ -192,7 +197,7 @@ class Data_Dump_Controller extends REST_Controller {
 				$addresses['other_pincode']=($pin == "" ? trim($splitStateAndPincode[1]) : null);
 				$pd_details['other_pincode'] = $addresses['other_pincode'];
 				$city = array_slice($NormalParts, -2, 1);
-				$addresses['fk_city']=$this->Data_Dump_Model->getId(7,trim($city[0]));
+				$addresses['fk_city']=$this->Data_Dump_Model->getId(7,$city[0]);
 				$pd_details['fk_city']=$addresses['fk_city'];
 				array_splice($NormalParts, -2);//removing city state and pincode.
 				// $reversedParts = explode('-', strrev($GSdataata[$i]), 2);
@@ -207,7 +212,7 @@ class Data_Dump_Controller extends REST_Controller {
 				log_message('ERROR',"G-Sheet For PD Step 2.5 (Fifth Cell address) GSheet data : ".$GSdata["PDLocation"]);
 			}
 			if(isset($GSdata["PersonDoing"]) && $GSdata["PersonDoing"] != ""){					
-				$pd_details['fk_createdby'] = $this->Data_Dump_Model->getId(8,trim($GSdata["PersonDoing"]));
+				$pd_details['fk_createdby'] = $this->Data_Dump_Model->getId(8,$GSdata["PersonDoing"]);
 				log_message('ERROR',"G-Sheet For PD Step 2.6 (Sixth Cell createdPerson) GSheet data : ".$GSdata["PersonDoing"]);
 			}
 			if(isset($GSdata["LoanAmount"]) && ($GSdata["LoanAmount"] != "" || $GSdata["LoanAmount"] != 0)){					
@@ -267,12 +272,11 @@ class Data_Dump_Controller extends REST_Controller {
 				log_message('ERROR',"G-Sheet For PD Step 2.9 (ninth Cell type/cs) GSheet data : ".$GSdata["Type_CustomerSegment"]." Modify : ".$modifytype." PD :".$pd_details['fk_pd_type']);
 			}
 			
-			if(isset($GSdata["DateofReceivingPDRequest"]) && $GSdata["DateofReceivingPDRequest"] != ""){					
+			// if(isset($GSdata["DateofReceivingPDRequest"]) && $GSdata["DateofReceivingPDRequest"] != ""){					
 				// $new_date_format = date('Y-m-d H:i:s', strtotime($GSdata["DateofReceivingPDRequest"]));
 				// $pd_details['pd_date_of_initiation'] = $new_date_format;
 				// log_message('ERROR',"G-Sheet For PD Step 2.10 (tenth Cell initiationdate) GSheet data : ".$GSdata["DateofReceivingPDRequest"]." PD :".$pd_details['pd_date_of_initiation']);
-				$pd_details['pd_date_of_initiation'] = date('Y-m-d H-i-s');
-			}
+			// }
 
 			if(isset($GSdata["RemarksonCurrentStatus"]) && $GSdata["RemarksonCurrentStatus"] != ""){					
 				$pd_details['remarks'] = "`Remarks on Current Status` : ".$GSdata["RemarksonCurrentStatus"];
@@ -287,6 +291,7 @@ class Data_Dump_Controller extends REST_Controller {
 		// die();
 		## Default Status section;
 		$pd_details['pd_status'] = TRIGGERED;
+		$pd_details['pd_date_of_initiation'] = date('Y-m-d H-i-s');
 		## Template ID Section. 
 		$fields = array('fk_template_id');
 		$where_condition_array = array('fk_lender_id'=>$fk_lender_id ,'fk_product_id'=> $fk_product_id,'fk_customer_segment'=> $fk_customer_segment,'isactive' => 1);
diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php
index e9f7d810..58b33dd4 100644
--- a/api/application/controllers/Template_Management_Controller.php
+++ b/api/application/controllers/Template_Management_Controller.php
@@ -1051,6 +1051,7 @@ class Template_Management_Controller extends REST_Controller {
 			$where_condition_array = $records;
 			$where_condition_array['isactive'] = 1;
 			$map_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATE_MAP_V2);		
+			// $map_table = array();
 			if(count($map_table)>0){
 							// $this->db->where('id',$map_table[0]['id']);
 							// $this->db->set('isactive',0);
@@ -1061,15 +1062,24 @@ class Template_Management_Controller extends REST_Controller {
 							$flag++;
 			}else{
 				// form Template is declare as gobally in m_pd_forms table @form_template column using CustomerSegmentID.
-				$form_template = $this->Template_Management_Model->GetFormTemplate($records['customer_segment_id']);	
+				// $form_template = array();
+				$regular_form_template = $this->Template_Management_Model->getFormTemplate($records['customer_segment_id']);	
+				$buiness_form_template = $this->getBuinessFormTemplate($records);
+				$key = array_search('13', array_column($regular_form_template, 'form_id'));
+				if (!empty($key)) {
+					unset($regular_form_template[$key]);//here 13th form is buiness unset here.id have both regular and buiness.
+					$form_template = array_merge($regular_form_template,$buiness_form_template);
+				}else{
+					$form_template = $regular_form_template;
+				}
 				$map_pk_id = $this->Template_Management_Model->saveTemplateMapping($records,TEMPLATE_MAP_V2);	
 				$c = "JSON ID Are =>"; //concate;
 				for($i=0; $i<count($form_template); $i++){
-					$template = $form_template[$i]['form_template'];
+					$template = $form_template[$i]['form_template'];					
 					if($template != null || $template != ""){
 						$fields = array('form_id' => $form_template[$i]['form_id'],'json' => $template,'map_id'=>$map_pk_id,'is_form_status'=>"DRAFT");
-						// if($form_template[$i]['form_id'] != 18 ||$form_template[$i]['form_id'] != 26){
-						if($form_template[$i]['form_id'] != 18 ||$form_template[$i]['form_id'] != 26 ||$form_template[$i]['form_id'] != 13){
+						if($form_template[$i]['form_id'] != 18 ||$form_template[$i]['form_id'] != 26){
+						// if($form_template[$i]['form_id'] != 18 ||$form_template[$i]['form_id'] != 26 ||$form_template[$i]['form_id'] != 13){
 						$json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2);	
 						$c = $c." ".$json_pk_id;}
 					}
@@ -1330,6 +1340,7 @@ class Template_Management_Controller extends REST_Controller {
 	}
     // analysing
 	public function getBuinessGroupFormsV2_get(){
+		// echo $_GET['map_id'];die;
 		// if((!isset($_GET['map_id'])))
 		// {
 		// 	$data['dataStatus'] = false;
@@ -1351,6 +1362,7 @@ class Template_Management_Controller extends REST_Controller {
 			{
 					$records['customer_segment_id'] = $this->get("customer_segment_id");}
 					$result_array = $this->Template_Management_Model->getTemplateMappingDetailsV2($records);
+					// echo "no problem";print_r($result_array);die;
 					if(!empty($result_array))
 					foreach($result_array as $inx => $arr)
 					{
@@ -1415,7 +1427,7 @@ class Template_Management_Controller extends REST_Controller {
 				if(!empty($filter_arr)){
 					$data['dataStatus'] = true;
 					$data['status'] = REST_Controller::HTTP_OK;
-					$data['available_question'] = $filter_arr;
+					// $data['available_question'] = $filter_arr;
 					// $data['json'] = $quest;
 					$this->response($data,REST_Controller::HTTP_OK);
 				}else{
@@ -1572,5 +1584,29 @@ class Template_Management_Controller extends REST_Controller {
 	// 	$return_arr = array();
 	// 	$i = 0 ;
 	// }
+	// http://localhost/AWSEC2/sparqapi/api/Template_Management_Controller/check
+	// public function check_get(){
+	// 	$form_template = $this->Template_Management_Model->getFormTemplate(4);	
+	// 	// print_r($form_template);die();
+	// 	$this->response($form_template,REST_Controller::HTTP_OK);
+	// }
+	public function getBuinessFormTemplate($records){
+		$fields = array('short_name');
+		$where_condition_array = array('entity_id'=>$records['entity_id'],"isactive"=>1);
+		$lender_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,'m_entity');			
+		$lender_short_name = $lender_table[0]['short_name'];
 
+		$fields = array(' abbr');
+		$where_condition_array = array('customer_segment_id'=>$records['customer_segment_id'],"isactive"=>1);
+		$segment_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,'m_customer_segment');			
+		$str =  substr($segment_table[0]['abbr'],-2);
+
+		$form_id = array(13,22,1,2,11);
+		//here 14 removed because finacial form calculation are there.
+		if(strcmp($str,'AI')) { array_push($form_id,16); }	
+		if(!strcasecmp($lender_short_name, 'CLIX')){ array_push($form_id,21); }
+		if(!strcasecmp($lender_short_name, 'CLIX') || (!strcasecmp($lender_short_name, 'MWISE'))) { array_push($form_id,23);}
+		$form_template = $this->Template_Management_Model->getBuinessFormTemplate($form_id);	
+		return $form_template;
+	}
 }
\ No newline at end of file
diff --git a/api/application/models/Data_Dump_Model.php b/api/application/models/Data_Dump_Model.php
index 9f30ce68..2a7b3961 100755
--- a/api/application/models/Data_Dump_Model.php
+++ b/api/application/models/Data_Dump_Model.php
@@ -133,9 +133,11 @@ class Data_Dump_Model extends SPARQ_Model {
 			if($flag == 3){$value = $keyword; 
 				           $select = "subproduct_id"; $table = "m_subproducts"; $where = "abbr";}
 			if($flag == 4){$select = "customer_segment_id"; $table = "m_customer_segment"; $where = "abbr";}
-			if($flag ==5 ){$select = "state_id"; $table = "m_states"; $where = "name";}
+			if($flag ==5 ){$value = $keyword; 
+						   $select = "state_id"; $table = "m_states"; $where = "name";}
 			if($flag ==6 ){$select = "pincode_id";$where = "pincode";$table = "m_pincode";}
-			if($flag ==7 ){$select = "city_id";$where = "name";$table = "m_city";}
+			if($flag ==7 ){$value = $keyword; 
+						   $select = "city_id";$where = "name";$table = "m_city";}
 			if($flag ==8 ){$select = "userid";$where = "first_name";$table = "m_user_profile";}
 			
 			$this->db->select($select);
diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php
index 8d1afde5..255602c2 100644
--- a/api/application/models/Template_Management_Model.php
+++ b/api/application/models/Template_Management_Model.php
@@ -450,4 +450,46 @@ class Template_Management_Model extends SPARQ_Model {
 	return $result;
    }
 
+//    public function getFormTemplate($csID){
+// 	// $sql_query = "'DRAFT'";
+// 	$sql_query_old = "SELECT m_template_forms.form_id,m_pd_forms.form_template 
+// 					FROM m_template_forms
+// 					JOIN m_template 
+// 					on m_template_forms.fk_template_id = m_template.template_id and m_template_forms.isactive = 1
+// 					JOIN m_pd_forms 
+// 					on m_pd_forms.pd_form_id = m_template_forms.form_id and m_pd_forms.isactive = 1
+// 					WHERE fk_customer_segment like '%`".$csID."`%' and m_template.isactive = 1 ";
+// 					// and form_template != ''";
+// 	// $result = $this->db->query($sql_query)->result_array();
+// 	// print_r($result);
+// 	// print_r($sql_query);die();
+// 	// return $result;
+
+//     $get_template_id = "SELECT m_template.template_id 
+// 						FROM m_template 
+// 						WHERE m_template.isactive = 1 and fk_customer_segment like '%`".$csID."`%' ";
+// 	$row = $this->db->query($get_template_id)->row();
+// 	// print_r($this->db->last_query());die();
+// 	// print_r($row);die();
+// 	if(isset($row->template_id)){
+// 		$template_id = $row->template_id;
+// 		$sql_query = "SELECT  m_pd_forms.pd_form_id as form_id,m_pd_forms.form_template
+// 				  FROM m_pd_forms
+// 				  LEFT JOIN m_template_forms 
+// 				    ON m_template_forms.form_id = m_pd_forms.form_id AND m_template_forms.isactive = 1
+// 				  WHERE m_template_forms.fk_template_id = ".$template_id;
+// 		$result = $this->db->query($sql_query)->result_array();
+// 		// print_r($this->db->last_query());die();
+// 		return $result;
+// 	}else{
+// 		return array();
+// 	}
+//    }
+	public function getBuinessFormTemplate($form_id){
+		$this->db->select('m_pd_forms.pd_form_id as form_id,m_pd_forms.form_template');
+		$this->db->from(PDFORMS.' as m_pd_forms');		
+		$this->db->where_in('m_pd_forms.pd_form_id',$form_id); // Must be id
+		$this->db->where('m_pd_forms.is_business_form',1);
+		return $this->db->get()->result_array();;
+	}
 }
\ No newline at end of file