From 092b8375d9d9081956dea2a967ee94a548b7e574 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Mon, 6 May 2024 11:36:22 +0700 Subject: [PATCH] update --- .../src/pages/EPrescription/Livechat/View.tsx | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/frontend/dashboard/src/pages/EPrescription/Livechat/View.tsx b/frontend/dashboard/src/pages/EPrescription/Livechat/View.tsx index c1dc31c7..bc9dc607 100644 --- a/frontend/dashboard/src/pages/EPrescription/Livechat/View.tsx +++ b/frontend/dashboard/src/pages/EPrescription/Livechat/View.tsx @@ -149,22 +149,8 @@ export default function AppointmentForm({ isEdit, id, currentAppointment }: Prop const {fields, append, remove} = useFieldArray({name: 'medicine',control: methods.control}) - // Autocomplite ICD - const [icdOptions, setIcdOptions] = useState([ - { value: '-', label: '-' } - ]); - const codes = defaultValues.diagnosis.split(','); - const [selectedIcdOptions, setSelectedIcdOptions] = useState([]); - useEffect(() => { - const selectedCodes = icdOptions.filter((icd) => { - return codes.includes(icd.value); - }); - setSelectedIcdOptions(selectedCodes); - setValue('diagnosis', selectedCodes); - }, [defaultValues.diagnosis]); - - - + // Autocomplite ICD + const [icdOptions, setIcdOptions] = useState([]); useEffect(() => { // Ambil data dari API dan atur opsi ICD axios.get('diagnosis') @@ -175,7 +161,20 @@ export default function AppointmentForm({ isEdit, id, currentAppointment }: Prop console.error('Error fetching ICD options:', error); }); }, []); // useEffect dijalankan hanya sekali saat komponen dimount - + + // Menggunakan selectedIcdOptions sebagai state untuk nilai default + const [selectedIcdOptions, setSelectedIcdOptions] = useState([]); + const codes = defaultValues.diagnosis.split(','); + useEffect(() => { + // Pastikan bahwa icdOptions sudah terisi sebelum memfilter + if (icdOptions.length > 0) { + const selectedCodes = icdOptions.filter((icd) => { + return codes.includes(icd.value); + }); + setSelectedIcdOptions(selectedCodes); + // setValue('diagnosis', selectedCodes); // Ini bisa Anda hilangkan jika tidak diperlukan + } + }, [icdOptions, defaultValues.diagnosis]); // Autocomplite Rumah Sakit