diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 1e169b88..7da74a72 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -2138,11 +2138,15 @@ class ClientController extends AdminController $data['congenitaldiseasesinternal'] = str_replace(',', '', $this->request->getPost("congenitaldiseasesinternal")); // $data['congenitaldiseasesexternal'] =$this->request->getPost("congenitaldiseasesexternal"); $data['copayzonewisecopay'] = $this->request->getPost("copayzonewisecopay"); + $data['co_pay_details'] = str_replace(',', '', $this->request->getPost("co_pay_details")); + $data['bioabsorbablestenttoriclensmultifocallens'] = $this->request->getPost("bioabsorbablestenttoriclensmultifocallens"); $data['roomrentlimit'] = str_replace(',', '', $this->request->getPost("roomrentlimit")); $data['proportionatedeductionclause'] = str_replace(',', '', $this->request->getPost("proportionatedeductionclause")); // $data['nursingallowance'] =str_replace(',', '',$this->request->getPost("nursingallowance")); - $data['ailmentcapping'] = str_replace(',', '', $this->request->getPost("ailmentcapping")); + $data['ailmentcapping'] = $this->request->getPost("ailmentcapping"); + $data['ailment_capping_details'] = str_replace(',', '', $this->request->getPost("ailment_capping_details")); + $data['ambulancecharges'] = str_replace(',', '', $this->request->getPost("ambulancecharges")); $data['airambulance'] = str_replace(',', '', $this->request->getPost("airambulance")); $data['familytransportationbenefit'] = str_replace(',', '', $this->request->getPost("familytransportationbenefit")); @@ -2151,7 +2155,7 @@ class ClientController extends AdminController $data['ayudhtreatmentcover'] = str_replace(',', '', $this->request->getPost("ayudhtreatmentcover")); $data['congenitaldiseasesexternal'] = str_replace(',', '', $this->request->getPost("congenitaldiseasesexternal")); - $data['optionalparentalcopay'] = str_replace(',', '', $this->request->getPost("optionalparentalcopay")); + // $data['optionalparentalcopay'] = str_replace(',', '', $this->request->getPost("optionalparentalcopay")); $data['posthospitalizationcover'] = str_replace(',', '', $this->request->getPost("posthospitalizationcover")); $data['corporatebuffer'] = str_replace(',', '', $this->request->getPost("corporatebuffer")); $data['sublimitofcorporatebuffer'] = str_replace(',', '', $this->request->getPost("sublimitofcorporatebuffer")); diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index af508898..c308d65f 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -1795,9 +1795,21 @@ class EmployeeController extends AdminController // 'client_id' => 77, // 'client_policy_id' => 203, // 'client_branch_id' => 53, - // 'insurer_or_tpa' => 'tpa', // ]; + // $batch_data['insurer_or_tpa'] = 'insurer'; + // $batch_data['insurer_or_tpa'] = 'tpa'; + + //INCEPTION + // $result = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($batch_data); + + // CORRECTION + // $result = $this->employeePolicyModel->getCorrectionEmployeesDataForExportExcel($batch_data); + + //SI-ENHANCEMENT + // $result = $this->employeePolicyModel->getSIEnhancementEmployeesDataForExportExcel($batch_data); + + //DELETION // $result = $this->employeePolicyModel->getDeletionEmployeeDataForExportExcel($batch_data); // print_rr($result); die; diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 75f8cd53..abbba1e4 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -331,6 +331,8 @@ class EmployeePolicyModel extends Model $client_branch_id = $ref_data['client_branch_id']; $insurer_or_tpa = $ref_data['insurer_or_tpa']; + $endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "AND (emp_endorsement.endorsement_id IS NOT NULL OR emp_endorsement.endorsement_id != '')" : "AND (emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')"; + $sql = " SELECT DISTINCT emp_endorsement.id, @@ -389,13 +391,14 @@ class EmployeePolicyModel extends Model AND employee_polices.client_policy_id = '{$client_policy_id}' AND employees.client_branch_id = '{$client_branch_id}' AND emp_endorsement.actions = 'c' + AND emp_endorsement.status != 'truncated' AND employee_polices.is_active = 1 AND employee_polices.status = 'active' AND employees.is_active = 1 AND employees.emp_status = 'active' AND (employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id != '') AND (employee_polices.uhid IS NOT NULL AND employee_polices.uhid != '') - AND (emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')"; + $endorsement_condition"; // Execute the raw query $query = $this->db->query($sql); @@ -403,6 +406,8 @@ class EmployeePolicyModel extends Model // Get the result set $result = $query->getResult(); + // dd($this->db->getLastQuery(), $result); + return $result; } @@ -416,6 +421,9 @@ class EmployeePolicyModel extends Model $client_branch_id = $ref_data['client_branch_id']; $insurer_or_tpa = $ref_data['insurer_or_tpa']; + $endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "AND (a.endorsement_id IS NOT NULL OR a.endorsement_id != '')" : "AND (a.endorsement_id IS NULL OR a.endorsement_id = '')"; + + $query = $this->db->query(" SELECT a.id as endorsement_primarykey, @@ -528,8 +536,9 @@ class EmployeePolicyModel extends Model WHERE employee_polices.client_policy_id = '{$client_policy_id}' AND employees.client_branch_id = '{$client_branch_id}' - AND (a.endorsement_id IS NULL OR a.endorsement_id = '') + $endorsement_condition AND a.actions = 'si' + AND a.status != 'truncated' AND employee_polices.is_active = 1 AND employee_polices.status = 'active' AND employees.is_active = 1 @@ -539,6 +548,7 @@ class EmployeePolicyModel extends Model // Get the result set $results = $query->getResult(); + // dd($this->db->getLastQuery(), $results); return $results; } diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php index 935b669d..6934ab5e 100755 --- a/app/Views/insurer_export_templete.php +++ b/app/Views/insurer_export_templete.php @@ -137,6 +137,7 @@ +