From b182272de342419bb6c75919e5dd40441814b53e Mon Sep 17 00:00:00 2001 From: R Date: Fri, 19 Jan 2024 14:25:15 +0700 Subject: [PATCH 1/3] Add Seeder UpdateTarifLMSSeeder --- database/seeders/UpdateTarifLMSSeeder.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/database/seeders/UpdateTarifLMSSeeder.php b/database/seeders/UpdateTarifLMSSeeder.php index ec4c011e..d763b194 100644 --- a/database/seeders/UpdateTarifLMSSeeder.php +++ b/database/seeders/UpdateTarifLMSSeeder.php @@ -2,6 +2,7 @@ namespace Database\Seeders; +use App\Models\OLDLMS\Healthcare; use App\Models\OLDLMS\JadwalDokter; use App\Models\OLDLMS\Speciality; use Illuminate\Database\Console\Seeds\WithoutModelEvents; @@ -128,6 +129,8 @@ class UpdateTarifLMSSeeder extends Seeder $spesialisUmum = Speciality::where('sSlug', 'general-practitioner')->first(); foreach ($dataTarifs as $tarif) { + $healthcareAppliedIds = Healthcare::whereIn('sKodeRS', $tarif['applied_to'])->pluck('nID'); + // [MARK] : UMUM // Update Tarif Dokter Umum $updateUmum = []; @@ -143,10 +146,7 @@ class UpdateTarifLMSSeeder extends Seeder // Updating $dokUmum = JadwalDokter::query() ->where('nIDSpesialis', $spesialisUmum->nID) - ->whereHas('healthcare', function($hc) use ($tarif) { - $hc->whereIn('sKodeRS', $tarif['applied_to']) - ->withTrashed(); - }) + ->whereIn('nIDHealthCare', $healthcareAppliedIds) ->withTrashed() ->update($updateUmum); $this->command->info('Updating : Dokter Umum'); @@ -170,10 +170,7 @@ class UpdateTarifLMSSeeder extends Seeder $q->where('nIDSpesialis', $spesialisUmum->nID); }) ->where('sIsSubSpesialis', 0) - ->whereHas('healthcare', function($hc) use ($tarif) { - $hc->whereIn('sKodeRS', $tarif['applied_to']) - ->withTrashed(); - }) + ->whereIn('nIDHealthCare', $healthcareAppliedIds) ->withTrashed() ->update($updateSpesialis); $this->command->info('Updating : Dokter Spesialis'); @@ -199,10 +196,7 @@ class UpdateTarifLMSSeeder extends Seeder $q->where('nIDSpesialis', $spesialisUmum->nID); }) ->where('sIsSubSpesialis', 1) - ->whereHas('healthcare', function($hc) use ($tarif) { - $hc->whereIn('sKodeRS', $tarif['applied_to']) - ->withTrashed(); - }) + ->whereIn('nIDHealthCare', $healthcareAppliedIds) ->withTrashed() ->update($updateSubSpesialis); $this->command->info('Updating : Dokter Sub Spesialis'); From 3f1c620742f3a0656b0fcb27db87e35d75e7fd27 Mon Sep 17 00:00:00 2001 From: R Date: Fri, 19 Jan 2024 16:42:07 +0700 Subject: [PATCH 2/3] UpdateTarifLMSSeeder add adm_rajal --- database/seeders/UpdateTarifLMSSeeder.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/database/seeders/UpdateTarifLMSSeeder.php b/database/seeders/UpdateTarifLMSSeeder.php index d763b194..91a83271 100644 --- a/database/seeders/UpdateTarifLMSSeeder.php +++ b/database/seeders/UpdateTarifLMSSeeder.php @@ -91,7 +91,7 @@ class UpdateTarifLMSSeeder extends Seeder $dataTarifs = [ // [ - // 'adm_rajal' => null, + // 'adm_rajal' => 0, // 'appt_umum' => null, // 'walkin_umum' => null, @@ -108,7 +108,7 @@ class UpdateTarifLMSSeeder extends Seeder // 'applied_to' => ['A', 'KODERSLMS'] // ], [ - 'adm_rajal' => 100000, + 'adm_rajal' => 55000, 'appt_umum' => 120000, 'walkin_umum' => 120000, @@ -135,11 +135,11 @@ class UpdateTarifLMSSeeder extends Seeder // Update Tarif Dokter Umum $updateUmum = []; if ($tarif['walkin_umum'] != null) { - $updateUmum['nBiaya'] = $tarif['walkin_umum']; + $updateUmum['nBiaya'] = $tarif['walkin_umum'] + $tarif['adm_rajal']; } if ($tarif['telekonsul_umum'] != null) { - $updateUmum['nBiayaTC'] = $tarif['telekonsul_umum']; - $updateUmum['nBiayaATC'] = $tarif['telekonsul_umum']; + $updateUmum['nBiayaTC'] = $tarif['telekonsul_umum'] + $tarif['adm_rajal']; + $updateUmum['nBiayaATC'] = $tarif['telekonsul_umum'] + $tarif['adm_rajal']; } if (count($updateUmum)) { // $updateUmum['dUpdateOn'] = now(); @@ -156,11 +156,11 @@ class UpdateTarifLMSSeeder extends Seeder // Update Tarif Dokter Spesialis $updateSpesialis = []; if ($tarif['walkin_spesialis'] != null) { - $updateSpesialis['nBiaya'] = $tarif['walkin_spesialis']; + $updateSpesialis['nBiaya'] = $tarif['walkin_spesialis'] + $tarif['adm_rajal']; } if ($tarif['telekonsul_spesialis'] != null) { - $updateSpesialis['nBiayaTC'] = $tarif['telekonsul_spesialis']; - $updateSpesialis['nBiayaATC'] = $tarif['telekonsul_spesialis']; + $updateSpesialis['nBiayaTC'] = $tarif['telekonsul_spesialis'] + $tarif['adm_rajal']; + $updateSpesialis['nBiayaATC'] = $tarif['telekonsul_spesialis'] + $tarif['adm_rajal']; } if (count($updateSpesialis)) { // $updateSpesialis['dUpdateOn'] = now(); @@ -181,11 +181,11 @@ class UpdateTarifLMSSeeder extends Seeder // Update Tarif Dokter Sub Spesialis $updateSubSpesialis = []; if ($tarif['walkin_subspesialis'] != null) { - $updateSubSpesialis['nBiaya'] = $tarif['walkin_subspesialis']; + $updateSubSpesialis['nBiaya'] = $tarif['walkin_subspesialis'] + $tarif['adm_rajal']; } if ($tarif['telekonsul_subspesialis'] != null) { - $updateSubSpesialis['nBiayaTC'] = $tarif['telekonsul_subspesialis']; - $updateSubSpesialis['nBiayaATC'] = $tarif['telekonsul_subspesialis']; + $updateSubSpesialis['nBiayaTC'] = $tarif['telekonsul_subspesialis'] + $tarif['adm_rajal']; + $updateSubSpesialis['nBiayaATC'] = $tarif['telekonsul_subspesialis'] + $tarif['adm_rajal']; } if (count($updateSubSpesialis)) { // $updateSubSpesialis['dUpdateOn'] = now(); From a54d9107f826a25de7afcee0e1d20d915e4e2e37 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 22 Jan 2024 09:46:06 +0700 Subject: [PATCH 3/3] Request untuk Tanggal Pengajuan LOG bisa dipilih --- .../Controllers/Api/RequestLogController.php | 11 +++++-- .../Controllers/Api/RequestLogController.php | 4 +-- app/Services/RequestLogService.php | 4 +-- .../hospital-portal/public/lang/en-US.json | 2 ++ .../hospital-portal/public/lang/id-ID.json | 2 ++ .../src/sections/dashboard/FormRequestLog.tsx | 32 +++++++++++++++++-- 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 5709ec4a..1d4acf0d 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -27,25 +27,30 @@ class RequestLogController extends Controller 'service_code' => $request->service_code, 'organization_id' => $request->organization_id, 'organization_name' => $request->organization_name, - 'address_provider' => $request->address_provider + 'address_provider' => $request->address_provider, + 'submission_date' => $request->submission_date, ]; $validator = Validator::make($request->all(), [ 'member_id' => 'required', - 'service_code' => 'required' + 'service_code' => 'required', + 'submission_date' => 'required' ], [ 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), + 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), ]); if($request->organization_id) { $validator = Validator::make($request->all(), [ 'organization_id' => 'required', 'member_id' => 'required', - 'service_code' => 'required' + 'service_code' => 'required', + 'submission_date' => 'required' ], [ 'organization_id.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']), + 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), ]); } if ($validator->fails()) diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 9f13e3e6..28d1c5d7 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -122,7 +122,7 @@ class RequestLogController extends Controller member: $member, paymentType: 'cashless', serviceCode: $request->service_code, - submissionDate: null, + submissionDate: $request->submission_date, // status: 'approved', status: 'requested', // di nonaktifkan dulu auto approved organization_id: $request->organization_id, @@ -145,7 +145,7 @@ class RequestLogController extends Controller member: $member, paymentType: 'cashless', serviceCode: $request->service_code, - submissionDate: null, + submissionDate: $request->submission_date, status: 'requested', organization_id: $request->organization_id, source: $request->source diff --git a/app/Services/RequestLogService.php b/app/Services/RequestLogService.php index 5a5a5c64..415a7ed2 100644 --- a/app/Services/RequestLogService.php +++ b/app/Services/RequestLogService.php @@ -26,7 +26,7 @@ class RequestLogService{ $member, $paymentType, $serviceCode, - $submissionDate = null, + $submissionDate, $status, $organization_id = null, $source ) @@ -48,7 +48,7 @@ class RequestLogService{ $requestLogData = [ 'code' => $code, 'member_id' => $member->id, - 'submission_date' => $submissionDate ?? now(), + 'submission_date' => $submissionDate ? $submissionDate : now(), 'status' => $status, 'payment_type' => $paymentType, 'service_code' => $serviceCode, diff --git a/frontend/hospital-portal/public/lang/en-US.json b/frontend/hospital-portal/public/lang/en-US.json index e68015ca..37990c22 100644 --- a/frontend/hospital-portal/public/lang/en-US.json +++ b/frontend/hospital-portal/public/lang/en-US.json @@ -14,6 +14,8 @@ "txtDialogMember3" : "Detail", "txtDialogMember4" : "Please select services", "txtDialogMember5" : "Submission Date", + "txtDialogMember6" : "Please select submission date", + "txtCreateAt" : "Create at", "txtDateBirth" : "Date of Birth", "txtGender" : "Gender", "txtMaritalStatus" : "Marital Status", diff --git a/frontend/hospital-portal/public/lang/id-ID.json b/frontend/hospital-portal/public/lang/id-ID.json index 7b95ede9..4e952700 100644 --- a/frontend/hospital-portal/public/lang/id-ID.json +++ b/frontend/hospital-portal/public/lang/id-ID.json @@ -14,6 +14,8 @@ "txtDialogMember3" : "Detail", "txtDialogMember4" : "Mohon pilih layanan", "txtDialogMember5" : "Tanggal Pengajuan", + "txtDialogMember6" : "Mohon pilih tanggal pengajuan", + "txtCreateAt" : "Tanggal Buat", "txtDateBirth" : "Tanggal Lahir", "txtGender" : "Jenis Kelamin", "txtMaritalStatus" : "Status Perkawinan", diff --git a/frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx b/frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx index 40d8b60f..af551bc7 100644 --- a/frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx @@ -19,6 +19,9 @@ import { LanguageContext } from '@/contexts/LanguageContext'; import Autocomplete from '@mui/material/Autocomplete'; import TextField from '@mui/material/TextField'; import Button from '@mui/material/Button'; +import { DatePicker, LocalizationProvider, MobileDatePicker } from '@mui/x-date-pickers'; +import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns'; +import { fPostFormat } from '@/utils/formatTime'; interface MemberType { members: any; @@ -33,6 +36,8 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe const { localeData }: any = useContext(LanguageContext); const [serviceCode, setServiceCode] = useState(''); const [idProvider, setIdProvider] = useState(0); + //Submission date + const [submissionDate, setSubmissionDate] = useState(format(new Date(), "yyyy MMM d")); const [submitLoading, setSubmitLoading] = useState(false); function submitRequest() { @@ -46,13 +51,19 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe enqueueSnackbar(localeData.txtDialogMember4, { variant: 'warning' }); return false; } + if(submissionDate == '') + { + enqueueSnackbar(localeData.txtDialogMember6, { variant: 'warning' }); + return false; + } setSubmitLoading(true); const formData = { member_id: member.members.id, service_code: serviceCode, organization_id: idProvider, organization_name : name, - address_provider: alamat + address_provider: alamat, + submission_date: fPostFormat(submissionDate, 'yyyy-MM-dd') }; axios .post('/request-log', formData) @@ -103,7 +114,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe - {localeData.txtDialogMember5} + {localeData.txtCreateAt} {format(new Date(), "d MMM yyyy")} @@ -177,6 +188,23 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe + + + {localeData.txtDialogMember5} * + + { + setSubmissionDate( (newValue)); + }} + inputFormat="dd-MM-yyyy" + renderInput={(params) => } + /> + + + +