From 42bb79554f2a2b4c3ec626de661068f1ed04239c Mon Sep 17 00:00:00 2001 From: riefive Date: Wed, 3 Dec 2025 10:06:51 +0700 Subject: [PATCH] fix: solve entry on encounter --- app/components/app/encounter/entry-form.vue | 224 +++++--------------- app/components/content/encounter/entry.vue | 44 +--- 2 files changed, 59 insertions(+), 209 deletions(-) diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue index 475cf78c..20a5bc1b 100644 --- a/app/components/app/encounter/entry-form.vue +++ b/app/components/app/encounter/entry-form.vue @@ -40,7 +40,7 @@ const props = defineProps<{ participantGroups?: any[] seps: any[] patient?: PatientEntity | null | undefined - // objects?: any + objects?: any }>() // Model @@ -91,17 +91,10 @@ const mode = props.mode !== undefined ? props.mode : 'add' // SEP validation state from props const isSepValid = computed(() => props.isSepValid || false) const isCheckingSep = computed(() => props.isCheckingSep || false) -<<<<<<< HEAD -const doctorOpts = computed(() => { - // Add default option - const defaultOption = [{ label: 'Pilih', value: '' }] - // Add doctors from props - const doctors = props.doctor || [] - return [...defaultOption, ...doctors] -}) -const isJKNPayment = computed(() => paymentType.value === 'jkn') +const isJKNPayment = computed(() => paymentMethodCode.value === 'jkn') const debouncedSepNumber = refDebounced(sepNumber, 500) const debouncedCardNumber = refDebounced(cardNumber, 500) +const unitFullName = ref('') // Unit, specialist, subspecialist if (mode === 'add') { // Set default sepDate to current date in YYYY-MM-DD format @@ -111,25 +104,13 @@ if (mode === 'add') { const day = String(today.getDate()).padStart(2, '0') registerDate.value = `${year}-${month}-${day}` } -======= -// Unit, specialist, subspecialist -const unitFullName = ref('') -watch(() => props.selectedDoctor, (doctor) => { - unitFullName.value = doctor.subspecialist?.name ?? - doctor.specialist?.name ?? - doctor.unit?.name ?? - 'tidak diketahui' - model.value!.unit_code = doctor.unit_code || '' - model.value!.specialist_code = doctor.specialist_code || '' - model.value!.subspecialist_code = doctor.subspecialist_code || '' - }, -) // const doctorOpts = computed(() => { // const defaultOption = [{ label: 'Pilih', value: '' }] // const doctors = props.doctors || [] // return [...defaultOption, ...doctors] // }) + // watch(doctorCode, (newValue) => { // // doctor.value = props.doctors?.find(doc => doc.code === newValue) // unitFullName.value = doctor.value?.subspecialist?.name ?? @@ -141,13 +122,6 @@ watch(() => props.selectedDoctor, (doctor) => { // // emit('event', 'unit-changed', unitName) // }) -const isJKNPayment = computed(() => paymentMethodCode.value === 'jkn') ->>>>>>> 9a8ee9d90f669a5395b14107d86d9f788118fa92 - -// async function onFetchChildren(parentId: string): Promise { -// console.log('onFetchChildren', parentId) -// } - // Watch specialist/subspecialist selection to fetch doctors // watch(subSpecialistCode, async (newValue) => { // if (newValue) { @@ -159,6 +133,17 @@ const isJKNPayment = computed(() => paymentMethodCode.value === 'jkn') // } // }) +watch(() => props.selectedDoctor, (doctor) => { + unitFullName.value = doctor.subspecialist?.name ?? + doctor.specialist?.name ?? + doctor.unit?.name ?? + 'tidak diketahui' + model.value!.unit_code = doctor.unit_code || '' + model.value!.specialist_code = doctor.specialist_code || '' + model.value!.subspecialist_code = doctor.subspecialist_code || '' + }, +) + watch(debouncedSepNumber, (newValue) => { emit('event', 'sep-number-changed', newValue) }) @@ -168,7 +153,6 @@ watch(debouncedCardNumber, (newValue) => { }) // Sync props to form fields -<<<<<<< HEAD watch( () => props.objects, (objects) => { @@ -176,43 +160,18 @@ watch( patientName.value = objects?.patientName || '' nationalIdentity.value = objects?.nationalIdentity || '' medicalRecordNumber.value = objects?.medicalRecordNumber || '' - doctorId.value = objects?.doctorId || '' - subSpecialistId.value = objects?.subSpecialistId || '' + doctorCode.value = objects?.doctorCode || '' + // subSpecialistCode.value = objects?.subSpecialistCode || '' registerDate.value = objects?.registerDate || '' - paymentType.value = objects?.paymentType || '' + paymentMethodCode.value = objects?.paymentMethodCode || '' patientCategory.value = objects?.patientCategory || '' cardNumber.value = objects?.cardNumber || '' sepType.value = objects?.sepType || '' sepNumber.value = objects?.sepNumber || '' - sepReference.value = objects?.sepReference || '' - sepControlDate.value = objects?.sepControlDate || '' - sepTrafficStatus.value = objects?.sepTrafficStatus || '' - diagnosis.value = objects?.diagnosis || '' } }, { deep: true, immediate: true }, ) -======= -// watch( -// () => props.objects, -// (objects) => { -// if (objects && Object.keys(objects).length > 0) { -// patientName.value = objects?.patientName || '' -// nationalIdentity.value = objects?.nationalIdentity || '' -// medicalRecordNumber.value = objects?.medicalRecordNumber || '' -// doctorCode.value = objects?.doctorCode || '' -// subSpecialistCode.value = objects?.subSpecialistCode || '' -// registerDate.value = objects?.registerDate || '' -// paymentMethodCode.value = objects?.paymentMethodCode || '' -// patientCategory.value = objects?.patientCategory || '' -// cardNumber.value = objects?.cardNumber || '' -// sepType.value = objects?.sepType || '' -// sepNumber.value = objects?.sepNumber || '' -// } -// }, -// { deep: true, immediate: true }, -// ) ->>>>>>> 9a8ee9d90f669a5395b14107d86d9f788118fa92 watch( () => props.patient, @@ -241,6 +200,10 @@ watch( }, ) +// async function onFetchChildren(parentId: string): Promise { +// console.log('onFetchChildren', parentId) +// } + function onAddSep() { const formValues = { patientId: patientId.value || '', @@ -248,13 +211,8 @@ function onAddSep() { // subSpecialistCode: subSpecialistCode.value, registerDate: registerDate.value, cardNumber: cardNumber.value, -<<<<<<< HEAD - paymentType: paymentType.value, - sepType: sepType.value, -======= paymentMethodCode: paymentMethodCode.value, sepType: sepType.value ->>>>>>> 9a8ee9d90f669a5395b14107d86d9f788118fa92 } emit('event', 'add-sep', formValues) } @@ -273,19 +231,6 @@ const onSubmit = handleSubmit((values) => { const formRef = ref(null) function submitForm() { -<<<<<<< HEAD -======= - console.log('🔵 submitForm called, formRef:', formRef.value) - console.log('🔵 Form values:', { - doctorCode: doctorCode.value, - // subSpecialistCode: subSpecialistCode.value, - registerDate: registerDate.value, - paymentMethodCode: paymentMethodCode.value, - }) - console.log('🔵 Form errors:', errors.value) - console.log('🔵 Form meta:', meta.value) - ->>>>>>> 9a8ee9d90f669a5395b14107d86d9f788118fa92 // Trigger form submit using native form submit // This will trigger validation and onSubmit handler if (formRef.value) { @@ -402,29 +347,8 @@ defineExpose({ :colCount="3" :cellFlex="false" > -<<<<<<< HEAD - - - - - - - - -