Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Modules/Client/Http/Controllers/Api/ClaimRequestController.php

@@ -63,7 +63,7 @@ class ClaimRequestController extends Controller
                         serviceCode: $request->service_code[$key],
                     );
 
-                    ClaimRequested::dispatch($newClaimRequest);
+                    // ClaimRequested::dispatch($newClaimRequest);
 
                      // Log History
                     $newClaimRequest->histories()->create([

Modules/Client/Http/Controllers/Api/CorporateMemberController.php

@@ -21,10 +21,15 @@ use Modules\Client\Transformers\Dashboard\MemberEmployeeDataResources as Dashboa
 use Modules\Client\Transformers\DataMemberResource;
 use Illuminate\Support\Facades\DB;
 
+use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
+use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
+use Modules\Internal\Services\MemberEnrollmentService;
+
 class CorporateMemberController extends Controller
 {
-    public function __construct(public CorporateMemberService $corporateMemberService)
+    public function __construct(public CorporateMemberService $corporateMemberService, MemberEnrollmentService $memberEnrollmentService)
     {
+        $this->memberEnrollmentService = $memberEnrollmentService;
     }
 
     /**
@@ -106,6 +111,111 @@ class CorporateMemberController extends Controller
        
     }
 
+    public function generateMemberList($corporate_id){
+        // Mendapatkan data yang akan diekspor (misalnya, dari database)
+       $data = Member::with(['currentPlan', 'currentCorporate', 'division', 'employeds', 'currentPolicy'])
+       // ->filter($request->all())
+       // ->where('corporate_id', $corporate_id)
+       ->whereHas('employeds', function ($employeds) use ($corporate_id) {
+           $employeds->where('corporate_id', $corporate_id);
+       })->get()->toArray();
+       // Membuat penulis entitas Spout
+       $writer = WriterEntityFactory::createXLSXWriter();
+
+       // Membuka penulis untuk menulis ke file
+       $writer->openToFile(public_path('files/CorporateMembershipList.xlsx'));
+       // Menulis header kolom
+       $headers_map_to_table_fields = $this->memberEnrollmentService->listing_doc_headers;
+       $headerRow = WriterEntityFactory::createRowFromArray($headers_map_to_table_fields);
+
+       $writer->addRow($headerRow);
+       // dd('test');
+       // Menulis data
+       if (!empty($data)) {
+           foreach ($data as $item) {
+               $rowData = [    $item['record_mode'], // Recode Mode
+                               $item['record_type'], // Recode Type
+                               $item['payor_id'], // Payor ID
+                               $item['member_id'], // Member ID
+                               $item['principal_id'], // Mapping ID
+                               NULL, // Link Medis Member ID
+                               $item['current_corporate']['code'] ?? null, // Corporate ID
+                               $item['employeds'][0]['nik'] ?? null, // NIK
+                               $item['division']['code'] ?? null, // Devision
+                               $item['employeds'][0]['branch_code'] ?? null, // Branch Code
+                               $item['bank_info'], // Bank Info
+                               $item['language'], // Language
+                               null, // Type of Work
+                               $item['race'], // Race
+                               $item['current_policy']['code'] ?? null, // Policy Number
+                               $item['marital_status'], // Marital Status
+                               $item['relation_with_principal'], // Relationship
+                               str_replace('-', '',$item['members_effective_date']), // Member effective date
+                               str_replace('-', '',$item['members_expire_date']), // Member expiry date
+                               NULL, // Faskes FKTP  (First Level Provider) or Individual preferred provider
+                               NULL, // Faskes FKRTL (Next Level Provider) or Individual group preferred provider
+                               $item['bpjs_class'], // The Right Classes Room of  BPJS Participants
+                               NULL, // Name of Faskes
+                               NULL, // Rule BPJSK
+                               NULL, // Internal Use
+                               $item['full_name'], // Member Name
+                               $item['address1'], // Address1
+                               $item['address2'], // Address2
+                               $item['address3'], // Address3
+                               $item['address4'], // Address4
+                               $item['city'], // City
+                               NULL, // State
+                               $item['postal_code'], // Post Code
+                               NULL, // Telephone - Mobile
+                               NULL, // Telephone - Res
+                               NULL, // Telephone - Office
+                               $item['nric'], // NRIC
+                               $item['passport_no'], // Passport No
+                               $item['passport_country'], // Passport Country
+                               $item['email'], // Email
+                               $item['identification_code'], // Identification Code
+                               $item['birth_date'], // Date of Birth
+                               $item['gender_code'], // Sex
+                               NULL, // Internal Use
+                               $item['current_plan']['code'] ?? null, // Plan-ID
+                               NULL, // Employment-Status
+                               NULL, // Internal Use
+                               NULL, // Internal Use
+                               NULL,// Internal Use
+                               str_replace('-', '',$item['terminated_date']), // Date Terminated
+                               $item['pre_existing'], // Pre Existing
+                               $item['bpjs_id'], // BPJS ID
+                               $item['endorsement_date'], // Endorsement Date
+                               $item['remarks'], // Remarks
+                               NULL, // Internal Use
+                               NULL,// Member Since
+                               NULL,// Internal Use
+                               $item['policy_in_force'], // Policy Inforce
+                               NULL, // Member Suspended
+                               str_replace('-', '',$item['activation_date']), // Activation Date
+                               NULL, // Internal Use
+                               $item['start_no_claim'], // StartNoClaim
+                               $item['end_no_claim'], // EndNoClaim
+                               NULL, // Option Mode
+                           ];
+               $row = WriterEntityFactory::createRowFromArray($rowData);
+               $writer->addRow($row);
+           }
+       }
+
+       // Menutup penulis
+       $writer->close();
+       // dd('test');
+       // Mengembalikan response untuk mengunduh file
+       $filePath = public_path('files/CorporateMembershipList.xlsx');
+       // dd($filePath);
+       // Mengembalikan response untuk mengunduh file
+       return Helper::responseJson([
+           'file_name' => "Corporate Plan & Benefit List " . date('Y-m-d h:i:s'),
+           "file_url" => url('files/CorporateMembershipList.xlsx')
+       ]);
+   }
+
     public function showPerMember($corporate_id, $member_id){
         $data = ClaimRequest::where(['member_id' => $member_id])
                     ->whereNotNull('claim_id')

Modules/Client/Routes/api.php

@@ -48,6 +48,7 @@ Route::prefix('client')->group(function () {
             Route::get('division', [CorporateDivisionController::class, 'index']);
             Route::get('members', [CorporateMemberController::class, 'index']);
             Route::get('members/{id}', [CorporateMemberController::class, 'show']);
+            Route::get('export-members/list', [CorporateMemberController::class, 'generateMemberList']);
             Route::get('alarm-center-members/{id}', [CorporateMemberController::class, 'showPerMember']);
             Route::get('service-monitoring/{id}', [CorporateMemberController::class, 'serviceMonitoring']);
             Route::get('claims/status', [ClaimController::class, 'status']);

Modules/HospitalPortal/Http/Controllers/Api/MemberController.php

@@ -96,6 +96,16 @@ class MemberController extends Controller
 
                 $res_data['type'] = $request->type;
 
+                // Provider
+                $providers = DB::table('organizations')
+                ->select(
+                    'organizations.id',
+                    'organizations.name'
+                )
+                ->get();
+
+                $res_data['providers'] = $providers;
+
                 
                 return ApiResponse::apiResponse("Success", $res_data, trans('Message.success'), 200);
             }

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -23,7 +23,10 @@ class RequestLogController extends Controller
     {
         $data = [
             'member_id' => $request->member_id,
-            'service_code' => $request->service_code
+            'service_code' => $request->service_code,
+            'id_provider' => $request->id_provider,
+            'name_provider' => $request->name_provider,
+            'adress_provider' => $request->address_provider
         ];
         $validator = Validator::make($request->all(), [
             'member_id' => 'required',
@@ -32,6 +35,18 @@ class RequestLogController extends Controller
             'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
             'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
         ]);
+        if($request->id_provider)
+        {
+            $validator = Validator::make($request->all(), [
+                'id_provider' => 'required',
+                'member_id' => 'required',
+                'service_code' => 'required'
+            ], [
+                'id_provider.required' => trans('Validation.required',['attribute' => 'Provider ID']),
+                'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
+                'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
+            ]);
+        }
         if ($validator->fails())
         {
             return ApiResponse::apiResponse('Bad Request', $data, $validator->errors(), 400);

app/Services/ClaimRequestService.php

@@ -20,7 +20,7 @@ use Str;
 
 class ClaimRequestService{
 
-    public static function storeClaimRequest($row = null, $code, $member, $paymentType, $serviceCode, $requestLogID, $submissionDate = null, $status = 'requested', $organization_code = null)
+    public static function storeClaimRequest($row = null, $code, $member, $paymentType, $serviceCode, $requestLogID = null, $submissionDate = null, $status = 'requested', $organization_code = null)
     {
         // try {
             $organization = False;
@@ -38,7 +38,7 @@ class ClaimRequestService{
 
             $claimRequestData = [
                 'code' => $code,
-                'request_log_id' => $requestLogID,
+                'request_log_id' => $requestLogID ?? 0,
                 'member_id' => $member->id,
                 'submission_date' => $submissionDate ?? now(),
                 'status' => $status,
@@ -60,6 +60,8 @@ class ClaimRequestService{
         // }
     }
 
+
+
     public static function storeClaimManagement($row, $member, $claim_request_id){
         try {
             $organization = 0;

composer.json

@@ -19,6 +19,7 @@
         "laravel/socialite": "^5.5",
         "laravel/tinker": "^2.7",
         "maatwebsite/excel": "^3.1",
+        "mikehaertl/phpwkhtmltopdf": "^2.5",
         "nwidart/laravel-modules": "^9.0",
         "phpmailer/phpmailer": "^6.9",
         "psr/simple-cache": "^1.0",

frontend/client-portal/src/pages/Dashboard/Index.tsx

@@ -235,12 +235,12 @@ export default function Index() {
       label: 'Divisi',
       isSort: true,
     },
-    {
+    // {
-      id: 'limit',
+    //   id: 'limit',
-      align: 'center',
+    //   align: 'center',
-      label: 'Limit',
+    //   label: 'Limit',
-      isSort: false,
+    //   isSort: false,
-    },
+    // },
     {
       id: 'status',
       align: 'center',
@@ -292,18 +292,18 @@ export default function Index() {
         corporateMembers.data.data.map((obj: any) => {
           return {
             ...obj,
-            limit: (
+            // limit: (
-              <Stack>
+            //   <Stack>
-                <BorderLinearProgress
+            //     <BorderLinearProgress
-                  variant="determinate"
+            //       variant="determinate"
-                  value={obj.limit.percentage}
+            //       value={obj.limit.percentage}
-                  sx={{ mb: 1 }}
+            //       sx={{ mb: 1 }}
-                />
+            //     />
-                <Typography sx={{ typography: 'caption', color: '#637381' }}>
+            //     <Typography sx={{ typography: 'caption', color: '#637381' }}>
-                  {fSplit(obj.limit.current)} / {fSplit(obj.limit.total)}
+            //       {fSplit(obj.limit.current)} / {fSplit(obj.limit.total)}
-                </Typography>
+            //     </Typography>
-              </Stack>
+            //   </Stack>
-            ),
+            // ),
             status:
               obj.status === 1 ? (
                 <Button
@@ -369,12 +369,12 @@ export default function Index() {
         </Stack>
 
         <Grid container spacing={2}>
-          <Grid item xs={12} lg={6} md={12}>
+          {/* <Grid item xs={12} lg={6} md={12}>
             <CardNotification data={itemList} />
           </Grid>
           <Grid item xs={12} lg={6} md={12}>
             <CardPolicy data={policyData} />
-          </Grid>
+          </Grid> */}
           <Grid item xs={12} lg={12} md={12}>
             <Table
               headCells={headCells}

frontend/client-portal/src/pages/EmployeeData/List.tsx

@@ -40,6 +40,7 @@ import TableMoreMenu from '../../components/table/TableMoreMenu';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import VisibilityOutlinedIcon from '@mui/icons-material/VisibilityOutlined';
 import Label from '../../components/Label';
+import { enqueueSnackbar } from 'notistack';
 
 
 /* ---------------------------------- types --------------------------------- */
@@ -229,10 +230,32 @@ export default function List() {
   };
 
   const searchs = {
+    useSearchs: true,
     searchText: searchText,
     setSearchText: setSearchText,
     handleSearchSubmit: handleSearchSubmit,
   };
+  const [startDateValue, setStartDateValue] = useState('');
+  const [endDateValue, setEndDateValue] = useState('');
+  const [statusValue, setStatusValue] = useState('all');
+
+  const handleExportReport = async (appliedFilter = null) => {
+    axios.get(corporateValue +  '/export-members/list').then((response) => {
+      const link = document.createElement('a');
+      link.href = response.data.data.file_url;
+      link.setAttribute('download', response.data.data.file_name);
+      document.body.appendChild(link);
+      link.click();
+      // handleClose();
+    });
+}
+  const exportReport = {
+    useExport: true,
+    startDate: startDateValue,
+    endDate: endDateValue,
+    status: statusValue,
+    handleExportReport: handleExportReport
+  }
 
   /* -------------------------------- headCell -------------------------------- */
   const headCells: HeadCell<never>[] = [
@@ -375,6 +398,7 @@ export default function List() {
         params={params}
         searchs={searchs}
         // filters={filters}
+        exportReport={exportReport}
       />
     </Stack>
   );

frontend/hospital-portal/public/lang/en-US.json

@@ -34,5 +34,9 @@
   "txtSupportingResultDocument" : "Supporting Result Document",
   "txtAddResult" : "Add Result",
   "txtServiceType" : "Service Type",
-  "txtAdditionalDocuments" : "Additional Documents"
+  "txtAdditionalDocuments" : "Additional Documents",
+  "txtAddNew" : "Add New",
+  "txtAddress" : "Address",
+  "txtProvider": "Provider",
+  "txtAlertProvider" : "Please enter provider"
 }

frontend/hospital-portal/public/lang/id-ID.json

@@ -34,5 +34,9 @@
   "txtSupportingResultDocument" : "Dokumen Hasil Pendukung",
   "txtAddResult" : "Tambah Hasil",
   "txtServiceType" : "Tipe Layanan",
-  "txtAdditionalDocuments" : "Dokumen Tambahan"
+  "txtAdditionalDocuments" : "Dokumen Tambahan",
+  "txtAddNew" : "Tambah Baru",
+  "txtAddress" : "Alamat",
+  "txtProvider": "Penyedia",
+  "txtAlertProvider" : "Mohon masukan provider"
 }

frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx

@@ -16,10 +16,14 @@ import { useRef, useState, useContext } from 'react';
 import { makeFormData } from '@/utils/jsonToFormData';
 import { format } from 'date-fns';
 import { LanguageContext } from '@/contexts/LanguageContext';
+import Autocomplete from '@mui/material/Autocomplete';
+import TextField from '@mui/material/TextField';
+import Button from '@mui/material/Button';
 
 interface MemberType {
     members: any;
     services: any;
+    providers:any;
 }
 interface FormRequestClaimProps {
     member: MemberType;
@@ -28,9 +32,15 @@ interface FormRequestClaimProps {
 export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRequestClaimProps) {
     const { localeData }: any =  useContext(LanguageContext);
     const [serviceCode, setServiceCode] = useState<string>('');
+    const [idProvider, setIdProvider] = useState<number>(0);
 
     const [submitLoading, setSubmitLoading] = useState<boolean>(false);
     function submitRequest() {
+        if(!idProvider&& (name == '' || alamat == ''))
+        {
+            enqueueSnackbar(localeData.txtAlertProvider, { variant: 'warning' });
+            return false;
+        }
         if(serviceCode == '')
         {
             enqueueSnackbar(localeData.txtDialogMember4, { variant: 'warning' });
@@ -39,7 +49,10 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
         setSubmitLoading(true);
         const formData = {
             member_id: member.members.id,
-            service_code: serviceCode
+            service_code: serviceCode,
+            id_provider: idProvider,
+            name_provider : name,
+            address_provider: alamat
         };
         axios
         .post('/request-log', formData)
@@ -64,8 +77,26 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
         name: string;
     }
 
+    interface Providers {
+        id: number;
+        name: string;
+    }
+
+    const [showAddNewForm, setShowAddNewForm] = useState(false);
+    const [name, setName] = useState('');
+    const [alamat, setAlamat] = useState('');
+
+    const handleAddNewData = () => {
+        // Logika untuk menambahkan data baru ke database
+        // Pastikan untuk menyesuaikan logika ini sesuai dengan kebutuhan aplikasi Anda
+        console.log('Adding new data:', { name, alamat });
+
+        // Setelah menambahkan data baru, Anda mungkin ingin melakukan sesuatu seperti menutup formulir tambahan atau melakukan pengaturan lainnya
+        setShowAddNewForm(false);
+    };
+
     return (
-        <Stack direction="column" spacing={4}>
+        <Stack direction="column" spacing={2}>
         <Stack direction="row" justifyContent={'end'} sx={{ marginBottom: 2 }} spacing={2}>
             <Typography variant='body2' sx={{color: '#757575'}}>
             {localeData.txtDialogMember5}
@@ -74,27 +105,71 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
         </Stack>
 
         <Stack direction="row" spacing={2}>
-            <Stack spacing={2} sx={{width:'100%'}}>
+            <Stack spacing={2} sx={{ width: '100%' }}>
-                <Typography variant='subtitle1'>{localeData.txtDialogMember1}*</Typography>
+                <Typography variant='subtitle1'>{localeData.txtProvider} *</Typography>
-                <FormControl>
+                <Autocomplete
-                <InputLabel htmlFor="service_type">
+                id="provider"
-                {localeData.txtDialogMember1}
+                options={[{ name: localeData.txtAddNew, id: 0 }, ...member?.providers || []]}
-                </InputLabel>
+                getOptionLabel={(option: Providers) => option.name || ''}
-                <Select
+                value={member?.providers.find((item: Providers) => item.id === idProvider) || null}
-                    id="service_type"
+                onChange={(event: React.ChangeEvent<{}>, newValue: Providers | null) => {
-                    value={serviceCode}
+                    if (newValue?.id === 0) {
+                    // Pengguna memilih opsi "Tambahkan Data Baru"
+                    setIdProvider(0); // Reset nilai
+                    setShowAddNewForm(true); // Menampilkan formulir tambahan
+                    } else {
+                    // Pengguna memilih opsi dari hasil pencarian
+                    setIdProvider(newValue?.id || 0);
+                    setShowAddNewForm(false); // Menyembunyikan formulir tambahan
+                    }
+                }}
+                renderInput={(params) => (
+                    <TextField
+                    {...params}
+                    label={localeData.txtProvider}
                     fullWidth
-                    label={localeData.txtDialogMember1}
+                    />
-                    onChange={(e) => {
+                )}
-                    setServiceCode(e.target.value);
+                />
-                    }}
+                {showAddNewForm && (
-                >
+                    <Stack direction="column" spacing={1} padding={1}>
-                {member && member?.services?.map((item: MemberService, index:number) => (
+                        <Typography variant='body2'>{localeData.txtAddNew} *</Typography>
-                    <MenuItem key={index} value={item.service_code}>{item.name}</MenuItem>
+                        <TextField
-                ))}
+                        label={localeData.txtName}
-                </Select>
+                        fullWidth
+                        onChange={(e) => setName(e.target.value)}
+                        />
+                        <TextField
+                        label={localeData.txtAddress}
+                        fullWidth
+                        onChange={(e) => setAlamat(e.target.value)}
+                        />
+                    </Stack>
+                )}
+                <FormHelperText style={{ color: 'red' }}></FormHelperText>
+            </Stack>
+        </Stack>
+        
+        <Stack direction="row" spacing={2}>
+            <Stack spacing={2} sx={{ width: '100%' }}>
+                <Typography variant='subtitle1'>{localeData.txtDialogMember1} *</Typography>
+                <Autocomplete
+                id="service_type"
+                options={member?.services || []}
+                getOptionLabel={(option: MemberService) => option.name || ''}
+                value={member?.services.find((item: MemberService) => item.service_code === serviceCode) || null}
+                onChange={(event: React.ChangeEvent<{}>, newValue: MemberService | null) => {
+                    setServiceCode(newValue?.service_code || '');
+                }}
+                renderInput={(params) => (
+                    <TextField
+                    {...params}
+                    label={localeData.txtDialogMember1}
+                    fullWidth
+                    />
+                )}
+                />
                 <FormHelperText style={{ color: 'red' }}></FormHelperText>
-                </FormControl>
             </Stack>
         </Stack>