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

tambah informasi provider

Browse Source
This commit is contained in:
Tb Fajri
2024-02-15 12:26:48 +07:00
parent 14949a47f9
commit f37657b154
5 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Client/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -222,7 +222,7 @@ class CorporateMemberController extends Controller
'requestLogBenefits:id,request_log_id,benefit_id,amount_incurred,amount_approved,amount_not_approved,excess_paid,keterangan' => [ 'requestLogBenefits:id,request_log_id,benefit_id,amount_incurred,amount_approved,amount_not_approved,excess_paid,keterangan' => [
'benefit' 'benefit'
], ],
'requestLogDailyMonitorings:id,request_log_id,created_at,subject,body_temperature,sistole,diastole,respiration_rate,analysis,lab_date,provider,examination' => [ 'requestLogDailyMonitorings:id,request_log_id,submission_date,subject,body_temperature,sistole,diastole,respiration_rate,analysis,lab_date,provider,examination' => [
'requestLogMedicalPlans:request_log_daily_monitoring_id,plan,type', 'requestLogMedicalPlans:request_log_daily_monitoring_id,plan,type',
// 'document' // 'document'
], ],

9
Modules/Client/Transformers/AlarmCenter/DataListClaimMemberResource.php
View File

@@ -4,6 +4,7 @@ namespace Modules\Client\Transformers\AlarmCenter;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use App\Models\Service; use App\Models\Service;
use App\Models\Organization;
class DataListClaimMemberResource extends JsonResource class DataListClaimMemberResource extends JsonResource
{ {
@@ -16,10 +17,15 @@ class DataListClaimMemberResource extends JsonResource
public function toArray($request) public function toArray($request)
{ {
$serviceData = Service::where('code', $this->service_code)->first(); $serviceData = Service::where('code', $this->service_code)->first();
$organization = Organization::where('id', $this->organization_id)->first();
$organizationName = '-';
if ($organization){
$organizationName = $organization->name;
}
if ($serviceData) { if ($serviceData) {
$serviceName = $serviceData->name; $serviceName = $serviceData->name;
} else { } else {
$serviceName = $this->service_cod; $serviceName = $this->service_code;
} }
if ($this->status == 'approved' && $this->status_final_log ){ if ($this->status == 'approved' && $this->status_final_log ){
@@ -34,6 +40,7 @@ class DataListClaimMemberResource extends JsonResource
'admission_date' => $this->submission_date ?? null, 'admission_date' => $this->submission_date ?? null,
'discharge_date' => $this->discharge_date ?? null, 'discharge_date' => $this->discharge_date ?? null,
'code' => $this->code ?? null, 'code' => $this->code ?? null,
'provider_name' => $organizationName ?? null,
'service_type' => $serviceName, 'service_type' => $serviceName,
'status' => $status, 'status' => $status,
]; ];

18
Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
View File

@@ -111,7 +111,7 @@ class DataServiceMonitoring extends JsonResource
'dischargeDate' => $this->discharge_date ?? null, 'dischargeDate' => $this->discharge_date ?? null,
'dailyMonitorings' => $this->when($this->service_code === 'IP', collect($this->requestLogDailyMonitorings) 'dailyMonitorings' => $this->when($this->service_code === 'IP', collect($this->requestLogDailyMonitorings)
->groupBy(function ($requestLogDailyMonitoring) { ->groupBy(function ($requestLogDailyMonitoring) {
return $requestLogDailyMonitoring->created_at->format('d M Y'); return Carbon::parse($requestLogDailyMonitoring->submission_date)->format('d M Y');
}) })
->map(function ($groupedItems) { ->map(function ($groupedItems) {
return collect($groupedItems) return collect($groupedItems)
@@ -138,7 +138,7 @@ class DataServiceMonitoring extends JsonResource
return [ return [
'time' => $requestLogDailyMonitoring->created_at->format('H:i') ?? null, 'time' => Carbon::parse($requestLogDailyMonitoring->submission_date)->format('H:i') ?? null,
'status' => 'Done' ?? null, 'status' => 'Done' ?? null,
'subject' => $requestLogDailyMonitoring->subject ?? null, 'subject' => $requestLogDailyMonitoring->subject ?? null,
'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null, 'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null,
@@ -168,18 +168,18 @@ class DataServiceMonitoring extends JsonResource
return Carbon::createFromFormat('d M Y', $date)->format('Y-m-d'); return Carbon::createFromFormat('d M Y', $date)->format('Y-m-d');
}) })
->all()) ?? null, ->all()) ?? null,
'laboratoriumResults' => $this->whenLoaded('requestLogDailyMonitorings', collect($this->requestLogDailyMonitorings) 'laboratoriumResults' => $this->when($this->service_code === 'IP', collect($this->requestLogDailyMonitorings)
->groupBy(function ($requestLogDailyMonitoring) { ->groupBy(function ($requestLogDailyMonitoring) {
return Carbon::parse($requestLogDailyMonitoring->lab_date)->format('d M Y'); return Carbon::parse($requestLogDailyMonitoring->lab_date)->format('d M Y');
}) })
->map(function ($groupedItems) { ->map(function ($groupedItems) {
return collect($groupedItems) return collect($groupedItems)
->map(function ($requestLogDailyMonitoring) { ->map(function ($test) {
$arr_document = []; $arr_document = [];
$document = DB::table('files') $document = DB::table('files')
->where([ ->where([
'fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_type' => 'App\Models\LaboratoriumResult',
'fileable_id' => $requestLogDailyMonitoring->id, 'fileable_id' => $test->id,
'deleted_at' => null 'deleted_at' => null
]) ])
->whereIn('type', ['laboratorium-result']) ->whereIn('type', ['laboratorium-result'])
@@ -195,10 +195,10 @@ class DataServiceMonitoring extends JsonResource
} }
} }
return [ return [
'code' => $requestLogDailyMonitoring->code, 'code' => $test->code,
'date' => Carbon::parse($requestLogDailyMonitoring->lab_date)->format('d M Y') ?? null, 'date' => Carbon::parse($test->lab_date)->format('d M Y') ?? null,
'examination' => $requestLogDailyMonitoring->examination ?? null, 'examination' => $test->examination ?? null,
'location' => $requestLogDailyMonitoring->provider ?? null, 'location' => $test->provider ?? null,
'files' => $arr_document 'files' => $arr_document
]; ];
}) })

6
frontend/client-portal/src/pages/AlarmCenter/ListMember.tsx
View File

@@ -109,6 +109,12 @@ export default function List() {
label: 'Code', label: 'Code',
isSort: true, isSort: true,
}, },
{
id: 'provider_name',
align: 'left',
label: 'Provider',
isSort: false,
},
{ {
id: 'service_type', id: 'service_type',
align: 'center', align: 'center',

58
frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx
View File

@@ -364,7 +364,7 @@ export default function DetailMonitoringList() {
/> />
</Grid> </Grid>
{ {
index == (fields1.length-1) ? index === 0 ?
( (
<Grid item xs={1} sx={{ textAlign: 'center' }}> <Grid item xs={1} sx={{ textAlign: 'center' }}>
<IconButton size='large' color='primary' onClick={() => append1({medical_plan_str: ''})}> <IconButton size='large' color='primary' onClick={() => append1({medical_plan_str: ''})}>
@@ -374,11 +374,22 @@ export default function DetailMonitoringList() {
) )
: :
( (
<Grid item xs={1} sx={{ textAlign: 'center' }}> index === (fields1.length - 1) ?
<IconButton size='large' color='error' onClick={() => remove1(index)}> (
<RemoveIcon /> <Grid item xs={1} sx={{ textAlign: 'center' }}>
</IconButton> <IconButton size='large' color='error' onClick={() => remove1(index)}>
</Grid> <RemoveIcon />
</IconButton>
</Grid>
)
:
(
<Grid item xs={1} sx={{ textAlign: 'center' }}>
<IconButton size='large' color='primary' onClick={() => append1({medical_plan_str: ''})}>
<AddIcon />
</IconButton>
</Grid>
)
) )
} }
</Grid> </Grid>
@@ -410,21 +421,30 @@ export default function DetailMonitoringList() {
/> />
</Grid> </Grid>
{ {
index == (fields2.length-1) ? index === 0 ?
( (
<Grid item xs={1} sx={{ textAlign: 'center' }}> <Grid item xs={1} sx={{ textAlign: 'center' }}>
<IconButton size='large' color='primary' onClick={() => append2({non_medikamentosa_plan_str: ''})}> <IconButton size='large' color='primary' onClick={() => append2({non_medikamentosa_plan_str: ''})}>
<AddIcon /> <AddIcon />
</IconButton> </IconButton>
</Grid> </Grid>
) ) : (
: index == (fields2.length-1) ?
( (
<Grid item xs={1} sx={{ textAlign: 'center' }}> <Grid item xs={1} sx={{ textAlign: 'center' }}>
<IconButton size='large' color='error' onClick={() => remove2(index)}> <IconButton size='large' color='error' onClick={() => remove2(index)}>
<RemoveIcon /> <RemoveIcon />
</IconButton> </IconButton>
</Grid> </Grid>
)
:
(
<Grid item xs={1} sx={{ textAlign: 'center' }}>
<IconButton size='large' color='primary' onClick={() => append2({non_medikamentosa_plan_str: ''})}>
<AddIcon />
</IconButton>
</Grid>
)
) )
} }
</Grid> </Grid>
@@ -558,12 +578,12 @@ export default function DetailMonitoringList() {
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>
<Typography variant="body1" component="div"> <Typography variant="body1" component="div">
Date* Date
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>
<Typography variant="body1" component="div"> <Typography variant="body1" component="div">
Provider* Provider
</Typography> </Typography>
</Grid> </Grid>
@@ -585,7 +605,7 @@ export default function DetailMonitoringList() {
</Grid> </Grid>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="body1" component="div"> <Typography variant="body1" component="div">
Examination* Examination
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={12} sx={{display: 'flex', gap: 1}}> <Grid item xs={12} sx={{display: 'flex', gap: 1}}>