diff --git a/Modules/Internal/Transformers/OrganizationResource.php b/Modules/Internal/Transformers/OrganizationResource.php
index 5b045a6f..72448ee3 100644
--- a/Modules/Internal/Transformers/OrganizationResource.php
+++ b/Modules/Internal/Transformers/OrganizationResource.php
@@ -3,6 +3,7 @@
namespace Modules\Internal\Transformers;
use Illuminate\Http\Resources\Json\JsonResource;
+use App\Models\Corporate;
class OrganizationResource extends JsonResource
{
@@ -14,7 +15,20 @@ class OrganizationResource extends JsonResource
*/
public function toArray($request)
{
-
+ $corporateId = $this->corporate_id_partner;
+ $corporateIds = explode(',', $corporateId);
+ $corporatePartner = '-';
+ if (count($corporateIds) > 0){
+ $corporatePartnerNames = Corporate::whereIn('id', $corporateIds)->get();
+ if (count($corporatePartnerNames)>0){
+ $corporateName = [];
+ foreach($corporatePartnerNames as $corporatePartnerName){
+ array_push($corporateName, $corporatePartnerName->name);
+ }
+ $corporatePartner = implode(', ', $corporateName);
+ }
+
+ }
$organization = [
'id' => $this->id,
'name' => $this->name,
@@ -32,6 +46,7 @@ class OrganizationResource extends JsonResource
'village_id' => $this->currentAddress->village_id ?? null,
'postal_code' => $this->currentAddress->postal_code ?? null,
'corporate_id_partner' => $this->corporate_id_partner ?? null,
+ 'corporate_name' => $corporatePartner,
'active' => $this->status == 'active' ? 1 : 0,
];
diff --git a/frontend/dashboard/src/@types/organization.tsx b/frontend/dashboard/src/@types/organization.tsx
index af5175a4..1af7adcd 100644
--- a/frontend/dashboard/src/@types/organization.tsx
+++ b/frontend/dashboard/src/@types/organization.tsx
@@ -22,6 +22,7 @@ export type Organizations = {
image_url: string;
region_groups: string;
corporate_id_partner: string;
+ corporate_name: string;
};
export type Provinces = {
diff --git a/frontend/dashboard/src/pages/Master/Hospitals/List.tsx b/frontend/dashboard/src/pages/Master/Hospitals/List.tsx
index bd0b7462..1ceffab9 100644
--- a/frontend/dashboard/src/pages/Master/Hospitals/List.tsx
+++ b/frontend/dashboard/src/pages/Master/Hospitals/List.tsx
@@ -260,6 +260,7 @@ export default function List() {
{row.name}
+ {row.corporate_id_partner ? 'Rekanan' : 'Non Rekanan'}
{row.phone}
{row.address}
@@ -292,26 +293,33 @@ export default function List() {
-
+
-
+
Kode Rumah Sakit
-
+
: {row.code ? row.code : '-'}
-
+
+ Rekanan
+
+
+ : {row.corporate_name ? row.corporate_name : '-'}
+
+
+
Longitude
-
+
: {row.lng ? row.lng : '-'}
-
+
Latittude
-
+
: {row.lat ? row.lat : '-'}
@@ -443,15 +451,18 @@ export default function List() {
Rumah Sakit
+
+ Rekanan (Partner)
+
Nomor IGD
Alamat
- {/*
+
Aksi
- */}
+
{dataTableIsLoading ? (