tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-02 14:05:48 +07:00
parent df4bd6946f
commit 4e988200b2
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -337,7 +337,13 @@ class MemberEnrollmentService
} }
public function dateParser($date_from_row) { public function dateParser($date_from_row) {
return is_string($date_from_row) ? Carbon::parse(strtotime($date_from_row)) : Carbon::parse($date_from_row);
if ($date_from_row instanceof DateTime) {
return $date_from_row->format('Y-m-d');
} else {
return date('Y-m-d', strtotime($date_from_row));
}
} }
public function validateDate($dateString, $dateFormat = 'Ymd'){ public function validateDate($dateString, $dateFormat = 'Ymd'){
@@ -545,12 +551,14 @@ class MemberEnrollmentService
if(!empty($row['date_terminated'])){ if(!empty($row['date_terminated'])){
$date_terminated = $row['date_terminated']; $date_terminated = $row['date_terminated'];
} }
$member_data = [ $member_data = [
"name" => $row['name'] ?? null, "name" => $row['name'] ?? null,
"member_id" => $row['member_id'] ?? null, "member_id" => $row['member_id'] ?? null,
"payor_id" => $row['payor_id'] ?? null, "payor_id" => $row['payor_id'] ?? null,
"nik" => $row['nik'] ?? null, "nik" => $row['nik'] ?? null,
"birth_date" => $row['date_of_birth'] ? date("Y-m-d",$row['date_of_birth']) : null, // "birth_date" => $row['date_of_birth'] ? date("Y-m-d",$row['date_of_birth']) : null,
"birth_date" => $this->dateParser($row['date_of_birth']),
"gender" => Helper::genderNormalization($row['sex']), "gender" => Helper::genderNormalization($row['sex']),
"language" => $row['language'] ?? null, "language" => $row['language'] ?? null,
"race" => $row['race'] ?? null, "race" => $row['race'] ?? null,
@@ -603,8 +611,13 @@ class MemberEnrollmentService
} }
// validasi member efektif date range date in periode date coroporate // validasi member efektif date range date in periode date coroporate
$member_effective_date = date("Y-m-d", strtotime($row['member_effective_date'])); // $member_effective_date = date("Y-m-d", strtotime($row['member_effective_date']));
$date_terminated = date("Y-m-d", strtotime($row['date_terminated'])); // $date_terminated = date("Y-m-d", strtotime($row['date_terminated']));
$member_effective_date = $this->dateParser($row['member_effective_date']);
$date_terminated = $this->dateParser($row['date_terminated']);
if(!empty($row['activation_date'])){ if(!empty($row['activation_date'])){
// $activation_date = date("Y-m-d", strtotime($row['activation_date'])); // $activation_date = date("Y-m-d", strtotime($row['activation_date']));
// if (($activation_date == $date_terminated) && ($activation_date == $member_effective_date)) { // if (($activation_date == $date_terminated) && ($activation_date == $member_effective_date)) {
@@ -630,10 +643,10 @@ class MemberEnrollmentService
// } // }
} }
// validasi member expried date range date in periode date coroporate // validasi member expried date range date in periode date coroporate
$members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date'])); // $members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date']));
// validasi member expried date must less date member effective // validasi member expried date must less date member effective
$members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date'])); // $members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date']));
$members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date'])); // $members_expire_date = date("Y-m-d", strtotime($row['member_expiry_date']));
// if ($member_effective_date <= $corporate->currentPolicy->start && ($member_effective_date != $corporate->currentPolicy->start)) { // if ($member_effective_date <= $corporate->currentPolicy->start && ($member_effective_date != $corporate->currentPolicy->start)) {
// throw new ImportRowException(__('enrollment.MORE_THAN', [ // throw new ImportRowException(__('enrollment.MORE_THAN', [
@@ -714,7 +727,6 @@ class MemberEnrollmentService
[ [
'name' => $row['name'] ?? null, 'name' => $row['name'] ?? null,
'birth_date' => $this->dateParser($row['date_of_birth']), 'birth_date' => $this->dateParser($row['date_of_birth']),
// 'birth_date' => $row['date_of_birth'],
'gender' => Helper::genderNormalization($row['sex']), 'gender' => Helper::genderNormalization($row['sex']),
'language' => $row['language'] ?? null, 'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null, 'race' => $row['race'] ?? null,
@@ -771,7 +783,7 @@ class MemberEnrollmentService
if ($member->save()) { if ($member->save()) {
$person = Person::create([ $person = Person::create([
'name' => $row['name'], 'name' => $row['name'],
'birth_date' => $this->dateParser($row['date_of_birth']) ?? null, 'birth_date' => $this->dateParser($row['date_of_birth']),
'gender' => Helper::genderNormalization($row['sex']) ?? '-', 'gender' => Helper::genderNormalization($row['sex']) ?? '-',
'language' => $row['language'] ?? null, 'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null, 'race' => $row['race'] ?? null,