update penambahan specialist dan dppj di request final log
This commit is contained in:
@@ -227,6 +227,8 @@ class RequestLogController extends Controller
|
|||||||
'members.member_id as no_polis',
|
'members.member_id as no_polis',
|
||||||
'members.birth_date',
|
'members.birth_date',
|
||||||
'request_logs.service_code',
|
'request_logs.service_code',
|
||||||
|
'request_logs.specialities_id',
|
||||||
|
'request_logs.dppj',
|
||||||
DB::raw('
|
DB::raw('
|
||||||
CASE
|
CASE
|
||||||
WHEN request_logs.status = "requested" THEN "requested"
|
WHEN request_logs.status = "requested" THEN "requested"
|
||||||
@@ -369,6 +371,8 @@ class RequestLogController extends Controller
|
|||||||
'final_log' => 1,
|
'final_log' => 1,
|
||||||
'service_code' =>$request->service_code,
|
'service_code' =>$request->service_code,
|
||||||
'discharge_date' => $request->discharge_date,
|
'discharge_date' => $request->discharge_date,
|
||||||
|
'dppj' => $request->dppj,
|
||||||
|
'specialities_id' => $request->spescialis_id,
|
||||||
'created_final_by'=> auth()->user()->id,
|
'created_final_by'=> auth()->user()->id,
|
||||||
'created_final_at'=> date('Y-m-d H:i:s'),
|
'created_final_at'=> date('Y-m-d H:i:s'),
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ Route::prefix('v1')->group(function() {
|
|||||||
Route::post('verify-code', [AuthController::class, 'verifCode']);
|
Route::post('verify-code', [AuthController::class, 'verifCode']);
|
||||||
|
|
||||||
Route::get('service-member/{id}', [AutocompleteController::class, 'serviceCode']);
|
Route::get('service-member/{id}', [AutocompleteController::class, 'serviceCode']);
|
||||||
|
Route::get('specialis', [AutocompleteController::class, 'specialisList']);
|
||||||
|
|
||||||
Route::middleware('auth:sanctum')->group(function () {
|
Route::middleware('auth:sanctum')->group(function () {
|
||||||
|
|
||||||
|
|||||||
@@ -117,8 +117,7 @@ class RequestLogShowResource extends JsonResource
|
|||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
$memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
|
$memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
|
||||||
|
if($requestLog['specialities_id'])
|
||||||
if(isset($requestLog['specialities_id']))
|
|
||||||
{
|
{
|
||||||
$spesialis = Speciality::query()
|
$spesialis = Speciality::query()
|
||||||
->where('id', $requestLog['specialities_id'])
|
->where('id', $requestLog['specialities_id'])
|
||||||
@@ -129,7 +128,7 @@ class RequestLogShowResource extends JsonResource
|
|||||||
$name = '-';
|
$name = '-';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($requestLog['specialities_id'])){
|
if ($requestLog['dppj']){
|
||||||
$dppj = $requestLog['dppj'];
|
$dppj = $requestLog['dppj'];
|
||||||
} else {
|
} else {
|
||||||
$dppj = '-';
|
$dppj = '-';
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ use App\Models\OLDLMS\User;
|
|||||||
use App\Models\Icd;
|
use App\Models\Icd;
|
||||||
use App\Models\Drug;
|
use App\Models\Drug;
|
||||||
use App\Models\Unit;
|
use App\Models\Unit;
|
||||||
|
use App\Models\Speciality;
|
||||||
use App\Models\MemberPlan;
|
use App\Models\MemberPlan;
|
||||||
use Illuminate\Contracts\Support\Renderable;
|
use Illuminate\Contracts\Support\Renderable;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -196,6 +197,17 @@ class AutocompleteController extends Controller {
|
|||||||
return response()->json($manipulatedPlan);
|
return response()->json($manipulatedPlan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function specialisList(Request $request){
|
||||||
|
$specialities = Speciality::query()->get();
|
||||||
|
$manipulatedSpecial = $specialities->map(function ($special) {
|
||||||
|
return [
|
||||||
|
'value' => optional($special)->id ,
|
||||||
|
'label' => optional($special)->name,
|
||||||
|
];
|
||||||
|
});
|
||||||
|
return response()->json($manipulatedSpecial);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,8 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
|
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
// Submit Form
|
// Submit Form
|
||||||
|
const [idSpecialities, setIdSpecialities] = useState(member.specialities_id);
|
||||||
|
const [inputDppj, setInputDppj] = useState(member.dppj);
|
||||||
const [submitLoading, setSubmitLoading] = useState(false);
|
const [submitLoading, setSubmitLoading] = useState(false);
|
||||||
function submitRequestFinalLog() {
|
function submitRequestFinalLog() {
|
||||||
if(dischargeDate == '')
|
if(dischargeDate == '')
|
||||||
@@ -102,6 +103,8 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
kondisi_files: fileKondisis,
|
kondisi_files: fileKondisis,
|
||||||
discharge_date: fPostFormat(dischargeDate, 'yyyy-MM-dd HH:mm:ss'),
|
discharge_date: fPostFormat(dischargeDate, 'yyyy-MM-dd HH:mm:ss'),
|
||||||
service_code: serviceCode,
|
service_code: serviceCode,
|
||||||
|
spescialis_id: idSpecialities,
|
||||||
|
dppj: inputDppj,
|
||||||
});
|
});
|
||||||
axios
|
axios
|
||||||
.post('/request-final-log', formData)
|
.post('/request-final-log', formData)
|
||||||
@@ -121,6 +124,9 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
const [serviceOptions, setServiceOptions] = useState([
|
const [serviceOptions, setServiceOptions] = useState([
|
||||||
{ value: '-', label: '-' }
|
{ value: '-', label: '-' }
|
||||||
]);
|
]);
|
||||||
|
const [specialisOptions, setSpecialisOptions] = useState([
|
||||||
|
{ value: '-', label: '-' }
|
||||||
|
]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
axios.get('service-member/'+member.member_id)
|
axios.get('service-member/'+member.member_id)
|
||||||
@@ -130,6 +136,13 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
console.error('Error fetching ICD options:', error);
|
console.error('Error fetching ICD options:', error);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
axios.get('specialis')
|
||||||
|
.then((response) => {
|
||||||
|
setSpecialisOptions(response.data);
|
||||||
|
}).catch((error) => {
|
||||||
|
console.error('Error fetching ICD options:', error);
|
||||||
|
});
|
||||||
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
console.log(serviceOptions, member, 'test')
|
console.log(serviceOptions, member, 'test')
|
||||||
@@ -365,7 +378,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
id="service_type"
|
id="service_type"
|
||||||
options={serviceOptions}
|
options={serviceOptions}
|
||||||
getOptionLabel={(option) => option.label || ""}
|
getOptionLabel={(option) => option.label || ""}
|
||||||
value={serviceOptions.find((opt) => opt.value == member.service_code) || null}
|
value={serviceOptions.find((opt) => opt.value == serviceCode) || null}
|
||||||
onChange={(event, newValue) => {
|
onChange={(event, newValue) => {
|
||||||
setServiceCode(newValue?.value || "");
|
setServiceCode(newValue?.value || "");
|
||||||
}}
|
}}
|
||||||
@@ -377,6 +390,42 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
|
|||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
|
{/* Specialist */}
|
||||||
|
<Stack direction="row" spacing={2}>
|
||||||
|
<Stack spacing={2} sx={{ width: '100%' }}>
|
||||||
|
<Typography variant='subtitle1'>{localeData.txtSpecialist}</Typography>
|
||||||
|
<Autocomplete
|
||||||
|
id='specialities'
|
||||||
|
options={specialisOptions}
|
||||||
|
getOptionLabel={(option) => option.label || ''}
|
||||||
|
value={specialisOptions.find((opt) => opt.value === idSpecialities) || null}
|
||||||
|
onChange={(event, newValue) => {
|
||||||
|
setIdSpecialities(newValue?.value || 0);
|
||||||
|
}}
|
||||||
|
renderInput={(params) => (
|
||||||
|
<TextField {...params} label={localeData.txtSpecialist} fullWidth />
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<FormHelperText style={{ color: 'red' }}></FormHelperText>
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
<Stack direction="row" spacing={2}>
|
||||||
|
<Stack spacing={2} sx={{ width: '100%' }}>
|
||||||
|
<Typography variant='subtitle1'>{ localeData.txtDPPJ }</Typography>
|
||||||
|
<TextField
|
||||||
|
id='dppj'
|
||||||
|
variant='outlined'
|
||||||
|
value={inputDppj}
|
||||||
|
placeholder={ localeData.txtDPPJ }
|
||||||
|
onChange={(event) => {
|
||||||
|
setInputDppj(event.target.value);
|
||||||
|
}}
|
||||||
|
fullWidth
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<LoadingButton
|
<LoadingButton
|
||||||
|
|||||||
@@ -355,6 +355,8 @@ export default function TableList() {
|
|||||||
submission_date:any,
|
submission_date:any,
|
||||||
service_code:any,
|
service_code:any,
|
||||||
member_id:any,
|
member_id:any,
|
||||||
|
specialities_id:any,
|
||||||
|
dppj:any,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
setOpenDialogFinalLog(true);
|
setOpenDialogFinalLog(true);
|
||||||
@@ -365,6 +367,8 @@ export default function TableList() {
|
|||||||
'submission_date' : submission_date,
|
'submission_date' : submission_date,
|
||||||
'service_code' : service_code,
|
'service_code' : service_code,
|
||||||
'member_id' : member_id,
|
'member_id' : member_id,
|
||||||
|
'specialities_id' : specialities_id,
|
||||||
|
'dppj' : dppj,
|
||||||
};
|
};
|
||||||
setDataViewFinalDialog(datas_view);
|
setDataViewFinalDialog(datas_view);
|
||||||
}
|
}
|
||||||
@@ -436,7 +440,16 @@ export default function TableList() {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
):''}
|
):''}
|
||||||
{obj.final_log === 0 && obj.status === 'approved' ? (
|
{obj.final_log === 0 && obj.status === 'approved' ? (
|
||||||
<MenuItem onClick={() => handleRequestFinalLog(obj.id, obj.full_name, obj.no_polis, obj.submission_date, obj.service_code, obj.member_id) }>
|
<MenuItem onClick={() => handleRequestFinalLog(
|
||||||
|
obj.id,
|
||||||
|
obj.full_name,
|
||||||
|
obj.no_polis,
|
||||||
|
obj.submission_date,
|
||||||
|
obj.service_code,
|
||||||
|
obj.member_id,
|
||||||
|
obj.specialities_id,
|
||||||
|
obj.dppj,
|
||||||
|
) }>
|
||||||
<Iconify icon="fa:file-text" />
|
<Iconify icon="fa:file-text" />
|
||||||
Request Final LOG
|
Request Final LOG
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|||||||
Reference in New Issue
Block a user