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

update Hide Approve dan Persetujuan

Browse Source
This commit is contained in:
ivan-sim
2026-03-31 11:43:34 +07:00
parent 765d1a5ef3
commit 20fa3fbc02
4 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Modules/HospitalPortal/Http/Controllers/Api/MemberController.php
View File

@@ -10,6 +10,9 @@ use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Modules\HospitalPortal\Helpers\ApiResponse; use Modules\HospitalPortal\Helpers\ApiResponse;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Models\CorporateBenefit;
use App\Models\MemberPlan;
use App\Models\Plan;
class MemberController extends Controller class MemberController extends Controller
{ {
@@ -134,26 +137,74 @@ class MemberController extends Controller
$res_data['companies'] = $companies; $res_data['companies'] = $companies;
$corporateEmployeePremi = DB::table('corporate_employees') $corporateEmployee = DB::table('corporate_employees')
->leftJoin('corporates', 'corporates.id', '=', 'corporate_employees.corporate_id') ->leftJoin('corporates', 'corporates.id', '=', 'corporate_employees.corporate_id')
->leftJoin('corporate_policies', 'corporate_policies.corporate_id', '=', 'corporates.id') ->leftJoin('corporate_policies', 'corporate_policies.corporate_id', '=', 'corporates.id')
->where('corporate_employees.status', 'ACTIVE') // ->where('corporate_employees.status', 'ACTIVE')
->where('corporates.active', 1) ->where('corporates.active', 1)
->where('corporate_policies.active', 1) ->where('corporate_policies.active', 1)
->where('corporate_employees.member_id', $members->id) ->where('corporate_employees.member_id', $members->id)
->value('corporate_policies.total_premi'); ->select(
'corporate_policies.total_premi',
'corporate_employees.corporate_id'
)
->first();
$res_data['total_premi'] = $corporateEmployeePremi ?? 0; $res_data['total_premi'] = $corporateEmployee ?? 0;
$limitRules = DB::table('member_plans') $limitRules = DB::table('member_plans')
->leftJoin('plans', 'plans.id', '=', 'member_plans.plan_id') ->leftJoin('plans', 'plans.id', '=', 'member_plans.plan_id')
->where('member_plans.member_id', $members->id) ->where('member_plans.member_id', $members->id)
->where('member_plans.status', 'active') ->where('member_plans.status', 'active')
->where('plans.active', 1) ->where('plans.active', 1)
->value('plans.limit_rules'); ->value('plans.limit_rules');
$res_data['limit_rules'] = $limitRules ?? 0; $res_data['limit_rules'] = $limitRules ?? 0;
$planMember = MemberPlan::where('member_id', $members->id)->get('plan_id');
$planId = Plan::whereIn('id', $planMember)->where('service_code', 'OP')->first();
$benefit = CorporateBenefit::with(['benefit', 'plan'])->where('plan_id', $planId->id)->get()->toArray();
$benefitData = [];
if (count($benefit)){
foreach($benefit as $data){
$data['benefit']['plan_id'] = $data['plan_id'];
$data['benefit']['limit_amount'] = $data['limit_amount'];
$data['benefit']['family_plan'] = $planId->family_plan;
$data['benefit']['max_frequency_period'] = $data['max_frequency_period'];
$data['benefit']['limit_amount_plan'] = $data['plan']['limit_rules'];
$data['benefit']['family_plan_plans'] = $data['plan']['family_plan'];
array_push($benefitData, $data['benefit']);
}
}
$memberUsage = Helper::getUsageMember($corporateEmployee->corporate_id, $members->id, $benefitData);;
$res_data['used_limit'] = json_decode($memberUsage);
$usedLimit = json_decode($memberUsage, true); // jadi array
$totalUsed = 0;
if (is_array($usedLimit)) {
foreach ($usedLimit as $value) {
$totalUsed += (int) $value;
}
}
$limitRules = (int) $limitRules;
// hitung sisa
$remainingLimit = $limitRules - $totalUsed;
// biar gak minus
if ($remainingLimit < 0) {
$remainingLimit = 0;
}
// set ke response
$res_data['remaining_limit'] = $remainingLimit;
$res_data['total_used_limit'] = $totalUsed;
// specialities // specialities
$specialities = DB::table('specialities') $specialities = DB::table('specialities')
->select( ->select(

8
frontend/hospital-portal/src/sections/dashboard/Components/DialogBenefit.tsx
View File

@@ -415,7 +415,7 @@ export default function DialogBenefit({requestLog, setOpenDialog, openDialog, cl
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={width}> <Grid item xs={width} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -440,7 +440,7 @@ export default function DialogBenefit({requestLog, setOpenDialog, openDialog, cl
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={width}> <Grid item xs={width} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -464,7 +464,7 @@ export default function DialogBenefit({requestLog, setOpenDialog, openDialog, cl
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={width}> <Grid item xs={width} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -484,7 +484,7 @@ export default function DialogBenefit({requestLog, setOpenDialog, openDialog, cl
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">

32
frontend/hospital-portal/src/sections/dashboard/Components/DialogEditBenefit.tsx
View File

@@ -26,7 +26,7 @@ type DialogDeleteType = {
openDialog: boolean; openDialog: boolean;
setOpenDialog: any; setOpenDialog: any;
onSubmit?: void; onSubmit?: void;
data: BenefitConfigurationListType|undefined; data: BenefitConfigurationListType|undefined;
id: number|undefined; id: number|undefined;
total: any total: any
} }
@@ -39,7 +39,7 @@ type BenefitSelected = {
limit_amount: number, limit_amount: number,
} }
export default function DialogEditBenefit({id, data, setOpenDialog, openDialog, onSubmit, total} : DialogDeleteType ) { export default function DialogEditBenefit({id, data, setOpenDialog, openDialog, onSubmit, total} : DialogDeleteType ) {
const handleCloseDialog = () => { const handleCloseDialog = () => {
setOpenDialog(false); setOpenDialog(false);
} }
@@ -79,7 +79,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
const amountApproved = parseFloat(watch('amount_approved')); const amountApproved = parseFloat(watch('amount_approved'));
const amountNotApproved = parseFloat(watch('amount_not_approved')); const amountNotApproved = parseFloat(watch('amount_not_approved'));
const excessPaid = parseFloat(watch('excess_paid')); const excessPaid = parseFloat(watch('excess_paid'));
// Hitung total baru // Hitung total baru
const totalAmountIncurred = total.totalAmountIncurred - data?.amount_incurred + amountIncurred; const totalAmountIncurred = total.totalAmountIncurred - data?.amount_incurred + amountIncurred;
const totalAmountApproved = total.totalAmountApproved - data?.amount_approved + amountApproved; const totalAmountApproved = total.totalAmountApproved - data?.amount_approved + amountApproved;
@@ -104,8 +104,8 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
// Konversi nilai ke angka dengan aman // Konversi nilai ke angka dengan aman
let limitAmount = Number(benefitData.limit_amount) || 0; let limitAmount = Number(benefitData.limit_amount) || 0;
let limitAmountPlan = Number(benefitData.limit_amount_plan) || 0; let limitAmountPlan = Number(benefitData.limit_amount_plan) || 0;
if (limitAmountPlan != 999999999){ if (limitAmountPlan != 999999999){
let realTimeUsage = totalAll().totalAmountApproved; let realTimeUsage = totalAll().totalAmountApproved;
console.log(limitAmountPlan, 'test') console.log(limitAmountPlan, 'test')
if (limitAmountPlan < realTimeUsage) { if (limitAmountPlan < realTimeUsage) {
@@ -162,11 +162,11 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
// // alert('Total Incurred tidak sama dengan Total Approve + Total Not Approve') // // alert('Total Incurred tidak sama dengan Total Approve + Total Not Approve')
// // setValue('amount_approved', data?.amount_approved) // // setValue('amount_approved', data?.amount_approved)
// } // }
// Submit Form // Submit Form
// ===================================== // =====================================
const submitHandler = async (data: BenefitConfigurationListType) => { const submitHandler = async (data: BenefitConfigurationListType) => {
const response = await postEditBenefit(id, data); const response = await postEditBenefit(id, data);
if (response == true) { if (response == true) {
@@ -191,19 +191,19 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
setValue('keterangan', data?.keterangan) setValue('keterangan', data?.keterangan)
setValue('reason', data?.reason) setValue('reason', data?.reason)
}, [data]) }, [data])
const getContent = () => ( const getContent = () => (
<FormProvider methods={methods} onSubmit={handleSubmit(submitHandler)}> <FormProvider methods={methods} onSubmit={handleSubmit(submitHandler)}>
<Stack paddingX={2} paddingY={4}> <Stack paddingX={2} paddingY={4}>
{/* <Card sx={{padding:2}}> */} {/* <Card sx={{padding:2}}> */}
<Box sx={{ marginTop:'10px', marginBottom:'10px', py: '8px', px: '12px', border:'1px solid #919EAB52', borderRadius: '6px'}}> <Box sx={{ marginTop:'10px', marginBottom:'10px', py: '8px', px: '12px', border:'1px solid #919EAB52', borderRadius: '6px'}}>
<Grid key={id} container spacing={2}> <Grid key={id} container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" sx={{ fontWeight: 'bold'}}> <Typography variant="subtitle1" sx={{ fontWeight: 'bold'}}>
{data?.benefit?.description} {data?.benefit?.description}
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2}>
<Grid container spacing={2}> <Grid container spacing={2}>
@@ -213,7 +213,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={12} sx={{display: 'flex', gap: 1}}> <Grid item xs={12} sx={{display: 'flex', gap: 1}}>
<RHFTextFieldMoney <RHFTextFieldMoney
key={id} key={id}
id='amount_incurred' id='amount_incurred'
name={`amount_incurred`} name={`amount_incurred`}
@@ -228,7 +228,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -252,7 +252,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -276,7 +276,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">
@@ -296,7 +296,7 @@ export default function DialogEditBenefit({id, data, setOpenDialog, openDialog,
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={2}> <Grid item xs={2} style={{display: "none"}}>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="subtitle1" component="div"> <Typography variant="subtitle1" component="div">

30
frontend/hospital-portal/src/sections/dashboard/DialogMember.tsx
View File

@@ -1,14 +1,14 @@
// mui // mui
import { styled } from '@mui/material/styles'; import { styled } from '@mui/material/styles';
import { LoadingButton, TabPanel } from "@mui/lab"; import { LoadingButton, TabPanel } from "@mui/lab";
import { import {
Button, Button,
Card, Card,
Divider, Divider,
Grid, Grid,
LinearProgress, LinearProgress,
linearProgressClasses, linearProgressClasses,
Typography, Typography,
Paper, Paper,
Table, Table,
TableBody, TableBody,
@@ -34,7 +34,7 @@ import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
export default function DialogMember(member:any, handleSubmitSuccess:() => void) { export default function DialogMember(member:any, handleSubmitSuccess:() => void) {
const { localeData }: any = useContext(LanguageContext); const { localeData }: any = useContext(LanguageContext);
const [currentTab, setCurrentTab] = useState('request'); const [currentTab, setCurrentTab] = useState('request');
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
useEffect(() => { useEffect(() => {
@@ -77,7 +77,7 @@ export default function DialogMember(member:any, handleSubmitSuccess:() => void)
</div> </div>
); );
} }
const [openRows, setOpenRows] = useState<any>({}); const [openRows, setOpenRows] = useState<any>({});
const handleRowToggle = (index:number) => { const handleRowToggle = (index:number) => {
@@ -120,6 +120,14 @@ export default function DialogMember(member:any, handleSubmitSuccess:() => void)
<Typography sx={{width:'50%'}} variant="body2">Limit Peserta</Typography> <Typography sx={{width:'50%'}} variant="body2">Limit Peserta</Typography>
<Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{ member?.limit_rules ? fCurrency(member?.limit_rules) : '-'}</Typography> <Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{ member?.limit_rules ? fCurrency(member?.limit_rules) : '-'}</Typography>
</Stack> </Stack>
<Stack direction="row" justifyContent="space-between">
<Typography sx={{width:'50%'}} variant="body2">Limit Terpakai</Typography>
<Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{ member?.total_used_limit ? fCurrency(member?.total_used_limit) : '-'}</Typography>
</Stack>
<Stack direction="row" justifyContent="space-between">
<Typography sx={{width:'50%'}} variant="body2">Sisa Limit</Typography>
<Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{ member?.remaining_limit ? fCurrency(member?.remaining_limit) : '-'}</Typography>
</Stack>
<Stack direction="row" justifyContent="space-between"> <Stack direction="row" justifyContent="space-between">
<Typography sx={{width:'50%'}} variant="body2">NRIC</Typography> <Typography sx={{width:'50%'}} variant="body2">NRIC</Typography>
<Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{member?.members.nik ?? '-'}</Typography> <Typography sx={{width:'50%', fontWeight: 'bold'}} variant="body2">{member?.members.nik ?? '-'}</Typography>
@@ -193,7 +201,7 @@ export default function DialogMember(member:any, handleSubmitSuccess:() => void)
</TableRow> </TableRow>
</TableBody> </TableBody>
))} ))}
</Table> </Table>
</TableContainer> </TableContainer>
</TabPanel> </TabPanel>
<TabPanel value={currentTab} index={'request'}> <TabPanel value={currentTab} index={'request'}>