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

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-02-09 14:49:57 +07:00
parent 0b4f5fd478 5d3a41c81b
commit f8f9356d4d
11 changed files with 560 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,8 +491,8 @@ class ClaimController extends Controller
!empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '', !empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '',
!empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '', !empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '',
!empty($item->diagnosis) ? $item->diagnosis : '', !empty($item->diagnosis) ? $item->diagnosis : '',
!empty($item->catatan) ? $item->catatan : '',
!empty($item->keterangan) ? $item->keterangan : '', !empty($item->keterangan) ? $item->keterangan : '',
!empty($item->catatan) ? $item->catatan : '',
]; ];
array_push($dataRow,$rowData); array_push($dataRow,$rowData);

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

@@ -212,7 +212,8 @@ class CorporateMemberController extends Controller
'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,created_at,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'
], ],
'service:code,name', 'service:code,name',
'files', 'files',

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

@@ -5,6 +5,7 @@ namespace Modules\Client\Transformers\AlarmCenter;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use App\Models\Icd; use App\Models\Icd;
use DB;
class DataServiceMonitoring extends JsonResource class DataServiceMonitoring extends JsonResource
{ {
@@ -22,17 +23,22 @@ class DataServiceMonitoring extends JsonResource
$filesFinalLogKondisi = []; $filesFinalLogKondisi = [];
if (count($this->files)>0){ if (count($this->files)>0){
foreach ($this->files as $key => $value) { foreach ($this->files as $key => $value) {
if($value->type == 'final-log-result'){ /*
Sementara di buat satu dulu, jangan di hapus..
karena suka labil client nya, tiba2 hide tiba2 munculin fitur :D
*/
// if($value->type == 'final-log-result'){
array_push($filesFinalLogResult, $value); array_push($filesFinalLogResult, $value);
}; // };
if($value->type == 'final-log-diagnosis'){ // if($value->type == 'final-log-diagnosis'){
array_push($filesFinalLogDiagnosis, $value); // array_push($filesFinalLogDiagnosis, $value);
} // }
if($value->type == 'final-log-kondisi'){ // if($value->type == 'final-log-kondisi'){
array_push($filesFinalLogKondisi, $value); // array_push($filesFinalLogKondisi, $value);
} // }
} }
$files = [ $files = [
@@ -77,7 +83,6 @@ class DataServiceMonitoring extends JsonResource
} }
} }
} }
return [ return [
'companyName' => $this->member->currentCorporate->name ?? null, 'companyName' => $this->member->currentCorporate->name ?? null,
'serviceCode' => $this->service_code ?? null, 'serviceCode' => $this->service_code ?? null,
@@ -111,6 +116,23 @@ class DataServiceMonitoring extends JsonResource
->map(function ($groupedItems) { ->map(function ($groupedItems) {
return collect($groupedItems) return collect($groupedItems)
->map(function ($requestLogDailyMonitoring) { ->map(function ($requestLogDailyMonitoring) {
$arr_document = [];
$document = DB::table('files')
->where(['fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_id' => $requestLogDailyMonitoring->id])
->whereIn('type', ['medical-action-letter', 'confirmation-medical-letter'])
->get();
if ($document){
foreach($document as $d){
$arr_document[]= [
'path' => env('APP_URL') . '/storage/lab_result/' . $d->name . '.' . $d->extension,
'type' => $d->type,
'original_name' => $d->original_name,
'name' => $d->name,
];
}
}
return [ return [
'time' => $requestLogDailyMonitoring->created_at->format('H:i') ?? null, 'time' => $requestLogDailyMonitoring->created_at->format('H:i') ?? null,
'status' => 'Done' ?? null, 'status' => 'Done' ?? null,
@@ -130,6 +152,7 @@ class DataServiceMonitoring extends JsonResource
}) })
->sortBy('type') ->sortBy('type')
->all()) ?? null, ->all()) ?? null,
'files' => $arr_document
]; ];
}) })
->sortByDesc(function ($item) { ->sortByDesc(function ($item) {
@@ -148,11 +171,27 @@ class DataServiceMonitoring extends JsonResource
->map(function ($groupedItems) { ->map(function ($groupedItems) {
return collect($groupedItems) return collect($groupedItems)
->map(function ($requestLogDailyMonitoring) { ->map(function ($requestLogDailyMonitoring) {
$arr_document = [];
$document = DB::table('files')
->where(['fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_id' => $requestLogDailyMonitoring->id])
->whereIn('type', ['laboratorium-result'])
->get();
if ($document){
foreach($document as $d){
$arr_document[]= [
'path' => env('APP_URL') . '/storage/lab_result/' . $d->name . '.' . $d->extension,
'type' => $d->type,
'original_name' => $d->original_name,
'name' => $d->name,
];
}
}
return [ return [
'code' => $requestLogDailyMonitoring->code, 'code' => $requestLogDailyMonitoring->code,
'date' => Carbon::parse($requestLogDailyMonitoring->lab_date)->format('d M Y') ?? null, 'date' => Carbon::parse($requestLogDailyMonitoring->lab_date)->format('d M Y') ?? null,
'examination' => $requestLogDailyMonitoring->examination ?? null, 'examination' => $requestLogDailyMonitoring->examination ?? null,
'location' => $requestLogDailyMonitoring->provider ?? null, 'location' => $requestLogDailyMonitoring->provider ?? null,
'files' => $arr_document
]; ];
}) })
->sortByDesc(function ($item) { ->sortByDesc(function ($item) {

15
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -26,10 +26,10 @@ class RequestLogController extends Controller
'member_id' => $request->member_id, 'member_id' => $request->member_id,
'service_code' => $request->service_code, 'service_code' => $request->service_code,
'organization_id' => $request->organization_id, 'organization_id' => $request->organization_id,
'organization_name' => $request->organization_name, 'organization_name' => !empty($request->organization_name) ? $request->organization_name : null,
'address_provider' => $request->address_provider, 'address_provider' => !empty($request->address_provider) ? $request->address_provider : null,
'submission_date' => $request->submission_date, 'submission_date' => $request->submission_date,
'corporate_id_partner' => $request->corporate_id_partner, 'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [],
]; ];
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'member_id' => 'required', 'member_id' => 'required',
@@ -40,7 +40,7 @@ class RequestLogController extends Controller
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]); ]);
if($request->organization_id) if(!empty($request->organization_id))
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'organization_id' => 'required', 'organization_id' => 'required',
@@ -62,7 +62,7 @@ class RequestLogController extends Controller
{ {
//insert data to organization //insert data to organization
try { try {
if(!$request->organization_id) if (!empty($request->organization_name) && !empty($request->address_provider))
{ {
// Memulai transaksi // Memulai transaksi
DB::beginTransaction(); DB::beginTransaction();
@@ -111,6 +111,7 @@ class RequestLogController extends Controller
} }
$requestLogControllerInstance = new PrimeCenterRequestLog(); $requestLogControllerInstance = new PrimeCenterRequestLog();
try {
$response = $requestLogControllerInstance->createNew($request); $response = $requestLogControllerInstance->createNew($request);
if($response->original['statusCode'] == 200) if($response->original['statusCode'] == 200)
@@ -148,6 +149,10 @@ class RequestLogController extends Controller
{ {
return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500); return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500);
} }
} catch (\Exception $e) {
// Tangani kesalahan di sini
return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500);
}
} catch (\Exception $e) { } catch (\Exception $e) {
// Rollback transaksi jika terjadi kesalahan // Rollback transaksi jika terjadi kesalahan
DB::rollBack(); DB::rollBack();

9
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -312,13 +312,14 @@ class DailyMonitoringController extends Controller
$name = 'labresult-' . uniqid(); $name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension(); $extension= $file->getClientOriginalExtension();
$fileName = $name . '.' . $extension; $fileName = $name . '.' . $extension;
$orignalName = $file->getClientOriginalName();
$path = $file->storeAs($this->path_for_store, $fileName); $path = $file->storeAs($this->path_for_store, $fileName);
File::create([ File::create([
'fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_type' => 'App\Models\LaboratoriumResult',
'fileable_id' => $db_response->id, 'fileable_id' => $db_response->id,
'type' => 'confirmation-medical-letter', 'type' => 'confirmation-medical-letter',
'name' => $name, 'name' => $name,
'original_name' => $fileName, 'original_name' => $orignalName,
'extension' => $extension, 'extension' => $extension,
'path' => $path, 'path' => $path,
]); ]);
@@ -330,13 +331,14 @@ class DailyMonitoringController extends Controller
$name = 'labresult-' . uniqid(); $name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension(); $extension= $file->getClientOriginalExtension();
$fileName = $name . '.' . $extension; $fileName = $name . '.' . $extension;
$orignalName = $file->getClientOriginalName();
$path = $file->storeAs($this->path_for_store, $fileName); $path = $file->storeAs($this->path_for_store, $fileName);
File::create([ File::create([
'fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_type' => 'App\Models\LaboratoriumResult',
'fileable_id' => $db_response->id, 'fileable_id' => $db_response->id,
'type' => 'medical-action-letter', 'type' => 'medical-action-letter',
'name' => $name, 'name' => $name,
'original_name' => $fileName, 'original_name' => $orignalName,
'extension' => $extension, 'extension' => $extension,
'path' => $path, 'path' => $path,
]); ]);
@@ -348,6 +350,7 @@ class DailyMonitoringController extends Controller
foreach ($request->result as $file) { foreach ($request->result as $file) {
$name = 'labresult-' . uniqid(); $name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension(); $extension= $file->getClientOriginalExtension();
$orignalName = $file->getClientOriginalName();
$fileName = $name . '.' . $extension; $fileName = $name . '.' . $extension;
$path = $file->storeAs($this->path_for_store, $fileName); $path = $file->storeAs($this->path_for_store, $fileName);
File::create([ File::create([
@@ -355,7 +358,7 @@ class DailyMonitoringController extends Controller
'fileable_id' => $db_response->id, 'fileable_id' => $db_response->id,
'type' => 'laboratorium-result', 'type' => 'laboratorium-result',
'name' => $name, 'name' => $name,
'original_name' => $fileName, 'original_name' => $orignalName,
'extension' => $extension, 'extension' => $extension,
'path' => $path, 'path' => $path,
]); ]);

7
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -106,7 +106,8 @@ class RequestLogController extends Controller
]); ]);
if ($request->member_id){ if ($request->member_id){
$code = $this->getNextCode($request); try {
$code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null;
$member = Member::find($request->member_id); $member = Member::find($request->member_id);
$memberValid = false; $memberValid = false;
@@ -163,7 +164,9 @@ class RequestLogController extends Controller
// return Helper::responseJson(status: 'failed', statusCode: 500, message: 'Member Not Valid'); // return Helper::responseJson(status: 'failed', statusCode: 500, message: 'Member Not Valid');
} }
} }
} catch (\Throwable $th) {
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
} }
return Helper::responseJson(status: 'success', statusCode: 200, message: 'Request LOG berhasil ajukan!', data: $request->toArray()); return Helper::responseJson(status: 'success', statusCode: 200, message: 'Request LOG berhasil ajukan!', data: $request->toArray());

6
Modules/Internal/Services/RequestLogService.php
View File

@@ -33,6 +33,7 @@ class RequestLogService
"Tgl Billing dari RS" => "approved_final_log_at", "Tgl Billing dari RS" => "approved_final_log_at",
"Total Billing" => "total_billing", "Total Billing" => "total_billing",
"Benefit Item" => "benefit_id", "Benefit Item" => "benefit_id",
"Amount Incurred" => "amount_incurred",
"Amount Approval" => "amount_approval", "Amount Approval" => "amount_approval",
"Amount Not Approval" => "amount_not_approval", "Amount Not Approval" => "amount_not_approval",
"Total COB" => "total_cob", "Total COB" => "total_cob",
@@ -57,6 +58,7 @@ class RequestLogService
"approved_final_log_at" => "Tgl Billing dari RS", "approved_final_log_at" => "Tgl Billing dari RS",
"total_billing" => "Total Billing", "total_billing" => "Total Billing",
"benefit_id" => "Benefit Item", "benefit_id" => "Benefit Item",
"amount_incurred" => "Amount Incurred",
"amount_approval" => "Amount Approval", "amount_approval" => "Amount Approval",
"amount_not_approval" => "Amount Not Approval", "amount_not_approval" => "Amount Not Approval",
"total_cob" => "Total COB", "total_cob" => "Total COB",
@@ -80,6 +82,7 @@ class RequestLogService
"Tgl Billing dari RS", "Tgl Billing dari RS",
"Total Billing", "Total Billing",
"Benefit Item", "Benefit Item",
"Amount Incurred",
"Amount Approval", "Amount Approval",
"Amount Not Approval", "Amount Not Approval",
"Total COB", "Total COB",
@@ -103,6 +106,7 @@ class RequestLogService
"Tgl Billing dari RS", "Tgl Billing dari RS",
"Total Billing", "Total Billing",
"Benefit Item", "Benefit Item",
"Amount Incurred",
"Amount Approval", "Amount Approval",
"Amount Not Approval", "Amount Not Approval",
"Total COB", "Total COB",
@@ -297,7 +301,7 @@ class RequestLogService
'request_log_id' => $requestLog->id, 'request_log_id' => $requestLog->id,
'benefit_id' => $benefit->id, 'benefit_id' => $benefit->id,
// 'amount_incurred' => ($row['amount_approval'] ? $row['amount_approval'] : 0) + ($row['amount_not_approval'] ? $row['amount_not_approval'] : 0) , // 'amount_incurred' => ($row['amount_approval'] ? $row['amount_approval'] : 0) + ($row['amount_not_approval'] ? $row['amount_not_approval'] : 0) ,
'amount_incurred' => $row['total_billing'] , 'amount_incurred' => $row['amount_incurred'] ,
'amount_approved' => $row['amount_approval'] ?? 0, 'amount_approved' => $row['amount_approval'] ?? 0,
'amount_not_approved' => $row['amount_not_approval'] ?? 0, 'amount_not_approved' => $row['amount_not_approval'] ?? 0,
'excess_paid' => $row['amount_not_approval'] ?? 0, 'excess_paid' => $row['amount_not_approval'] ?? 0,

2
app/Models/RequestDailyMonitoring.php
View File

@@ -87,7 +87,7 @@ class RequestDailyMonitoring extends Model
foreach ($document as $row) { foreach ($document as $row) {
$arr_document[] = [ $arr_document[] = [
'file_name' => $row->original_name, 'file_name' => $row->original_name,
'path' => env('APP_URL') . '/storage/lab_result/' . $row->original_name, 'path' => env('APP_URL') . '/storage/lab_result/' . $row->name .'.'. $row->extension,
'type' => $row->type, 'type' => $row->type,
]; ];
} }

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

@@ -175,6 +175,10 @@ export default function List() {
<VisibilityOutlinedIcon /> <VisibilityOutlinedIcon />
View View
</MenuItem> </MenuItem>
{/* <MenuItem onClick={() => navigate('service-monitoring/' + obj.id)}>
<Download />
Document Member
</MenuItem> */}
</> </>
} }
/> />

111
frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
View File

@@ -179,6 +179,12 @@ type ServiceMonitoringProps = {
type: number; type: number;
plan: string; plan: string;
}[]; }[];
files: {
type: string;
name: string;
original_name: string;
path: string;
}[];
}> }>
>; >;
laboratoriumResults: Record< laboratoriumResults: Record<
@@ -188,6 +194,12 @@ type ServiceMonitoringProps = {
date: string; date: string;
examination: string; examination: string;
location: string; location: string;
files: {
type: string;
name: string;
original_name: string;
path: string;
}[];
}> }>
>; >;
}; };
@@ -387,7 +399,7 @@ export default function ServiceMonitoring() {
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={12} container spacing={3}> <Grid item xs={12} container spacing={3}>
<Grid item container xs={12} spacing={1.5}> {/* <Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? <Skeleton animation={'wave'} width={200} /> : 'Symptoms'} {loading ? <Skeleton animation={'wave'} width={200} /> : 'Symptoms'}
@@ -404,8 +416,8 @@ export default function ServiceMonitoring() {
)} )}
</Typography> </Typography>
</Grid> </Grid>
</Grid> </Grid> */}
<Grid item container xs={12} spacing={1.5}> {/* <Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? <Skeleton animation={'wave'} width={200} /> : 'Sign'} {loading ? <Skeleton animation={'wave'} width={200} /> : 'Sign'}
@@ -422,7 +434,7 @@ export default function ServiceMonitoring() {
)} )}
</Typography> </Typography>
</Grid> </Grid>
</Grid> </Grid> */}
<Grid item container xs={12} spacing={1.5}> <Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
@@ -441,7 +453,7 @@ export default function ServiceMonitoring() {
</Typography> </Typography>
</Grid> </Grid>
</Grid> </Grid>
<Grid item container xs={12} spacing={1.5}> {/* <Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? ( {loading ? (
@@ -462,14 +474,14 @@ export default function ServiceMonitoring() {
)} )}
</Typography> </Typography>
</Grid> </Grid>
</Grid> </Grid> */}
<Grid item container xs={12} spacing={1.5}> <Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? ( {loading ? (
<Skeleton animation={'wave'} width={200} /> <Skeleton animation={'wave'} width={200} />
) : ( ) : (
'Files Result' 'Files Document'
)} )}
</Typography> </Typography>
</Grid> </Grid>
@@ -502,7 +514,7 @@ export default function ServiceMonitoring() {
</Typography> </Typography>
)} )}
</Grid> </Grid>
<Grid item xs={12}> {/* <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? ( {loading ? (
<Skeleton animation={'wave'} width={200} /> <Skeleton animation={'wave'} width={200} />
@@ -539,8 +551,8 @@ export default function ServiceMonitoring() {
- -
</Typography> </Typography>
)} )}
</Grid> </Grid> */}
<Grid item xs={12}> {/* <Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}> <Typography variant="subtitle2" color={'grey.600'}>
{loading ? ( {loading ? (
<Skeleton animation={'wave'} width={200} /> <Skeleton animation={'wave'} width={200} />
@@ -548,8 +560,8 @@ export default function ServiceMonitoring() {
'Files Kondisi' 'Files Kondisi'
)} )}
</Typography> </Typography>
</Grid> </Grid> */}
<Grid item> {/* <Grid item>
{loading ? ( {loading ? (
<Skeleton animation="wave" width={300} /> <Skeleton animation="wave" width={300} />
) : data && data.files && data.files.kondisi.length > 0 ? ) : data && data.files && data.files.kondisi.length > 0 ?
@@ -576,7 +588,7 @@ export default function ServiceMonitoring() {
- -
</Typography> </Typography>
)} )}
</Grid> </Grid> */}
</Grid> </Grid>
</Grid> </Grid>
@@ -833,6 +845,7 @@ export default function ServiceMonitoring() {
</Card> </Card>
</Grid> */} </Grid> */}
{data?.serviceCode === 'IP' ? (
<Grid item xs={12} lg={12} md={12}> <Grid item xs={12} lg={12} md={12}>
{loading ? ( {loading ? (
<Card sx={{ borderRadius: '16px', padding: '24px' }}> <Card sx={{ borderRadius: '16px', padding: '24px' }}>
@@ -1088,6 +1101,40 @@ export default function ServiceMonitoring() {
</Grid> </Grid>
</Stack> </Stack>
<Stack spacing={1}>
<Typography variant="h6" sx={{ paddingTop: 2 }}>
File Document :
</Typography>
</Stack>
<Stack direction={'row'} spacing={2}>
<Stack marginLeft={5}>
{data.dailyMonitorings ? (
<ul style={{ listStyleType: 'disc' }}>
{dailyMonitoring.files.length > 0 ? (
dailyMonitoring.files.map((file, fileIndex) =>
(
<li key={fileIndex}>
<a
href={file.path}
download={file.original_name ? file.original_name : 'test'}
style={{ cursor: 'pointer', textDecoration: 'none', color: '#19BBBB' }}
target="_blank"
>
{file.original_name}
</a>
</li>
)
)
) : (
<li>-</li>
)}
</ul>
) : (
<span>-</span>
)}
</Stack>
</Stack>
</Grid> </Grid>
</Stack> </Stack>
</Card> </Card>
@@ -1138,15 +1185,34 @@ export default function ServiceMonitoring() {
<TableCell><Label>{laboratoriumResult.date || '-'}</Label></TableCell> <TableCell><Label>{laboratoriumResult.date || '-'}</Label></TableCell>
<TableCell>{laboratoriumResult.examination || '-'}</TableCell> <TableCell>{laboratoriumResult.examination || '-'}</TableCell>
<TableCell>{laboratoriumResult.location || '-'}</TableCell> <TableCell>{laboratoriumResult.location || '-'}</TableCell>
{/* <TableMoreMenu </TableRow>
actions={ <TableRow>
<> <TableCell>
<MenuItem onClick={() => handleDownloadClick(laboratoriumResult.file)}> {data.dailyMonitorings ? (
<DownloadIcon /> Download <ul style={{ listStyleType: 'disc' }}>
</MenuItem> {laboratoriumResult.files.length > 0 ? (
</> laboratoriumResult.files.map((file, fileIndex) =>
} (
/> */} <li key={fileIndex}>
<a
href={file.path}
download={file.original_name ? file.original_name : 'test'}
style={{ cursor: 'pointer', textDecoration: 'none', color: '#19BBBB' }}
target="_blank"
>
{file.original_name}
</a>
</li>
)
)
) : (
<li>-</li>
)}
</ul>
) : (
<span>-</span>
)}
</TableCell>
</TableRow> </TableRow>
</TableBody> </TableBody>
</Table> </Table>
@@ -1165,6 +1231,7 @@ export default function ServiceMonitoring() {
</Card> </Card>
)} )}
</Grid> </Grid>
) : null}
</Grid> </Grid>
</Page> </Page>
); );

6
frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx
View File

@@ -196,7 +196,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }} style={{ display: 'none' }}
multiple multiple
onChange={handleKondisiInputChange} onChange={handleKondisiInputChange}
accept="application/pdf" accept="application/pdf,image/*"
/> />
</ButtonBase> </ButtonBase>
</Stack> </Stack>
@@ -257,7 +257,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }} style={{ display: 'none' }}
multiple multiple
onChange={handleDiagnosaInputChange} onChange={handleDiagnosaInputChange}
accept="application/pdf" accept="application/pdf,image/*"
/> />
</ButtonBase> </ButtonBase>
</Stack> </Stack>
@@ -318,7 +318,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }} style={{ display: 'none' }}
multiple multiple
onChange={handleResultInputChange} onChange={handleResultInputChange}
accept="application/pdf" accept="application/pdf,image/*"
/> />
</ButtonBase> </ButtonBase>
</Stack> </Stack>