fix: conflict after rebase

This commit is contained in:
riefive
2025-11-13 13:16:47 +07:00
parent 8e0f6a52d8
commit a3ddbac0af
4 changed files with 21 additions and 6 deletions
+3
View File
@@ -150,6 +150,9 @@ watch(props, (value) => {
if (objects?.sepType === 'external') { if (objects?.sepType === 'external') {
admissionType.value = '1' admissionType.value = '1'
} }
if (objects?.diagnoseLabel) {
initialDiagnosis.value = objects?.diagnoseLabel
}
isDateReload.value = true isDateReload.value = true
setTimeout(() => { setTimeout(() => {
if (objects?.letterDate) { if (objects?.letterDate) {
+13 -3
View File
@@ -179,7 +179,7 @@ async function getLetterMappers(admissionType: string, search: string) {
doctor: '', doctor: '',
information: { information: {
facility: lettersRaw?.asalFaskes || '', facility: lettersRaw?.asalFaskes || '',
diagnoses: lettersRaw?.rujukan?.diagnosa?.kode || '', diagnose: lettersRaw?.rujukan?.diagnosa?.kode || '',
serviceType: lettersRaw?.rujukan?.pelayanan?.kode || '', serviceType: lettersRaw?.rujukan?.pelayanan?.kode || '',
classLevel: lettersRaw?.rujukan?.peserta?.hakKelas?.kode || '', classLevel: lettersRaw?.rujukan?.peserta?.hakKelas?.kode || '',
poly: lettersRaw?.rujukan?.poliRujukan?.kode || '', poly: lettersRaw?.rujukan?.poliRujukan?.kode || '',
@@ -376,7 +376,7 @@ async function handleEvent(menu: string, value: any) {
selectedObjects.value = {} selectedObjects.value = {}
selectedLetter.value = letter.letterNumber selectedLetter.value = letter.letterNumber
isLetterReadonly.value = true isLetterReadonly.value = true
setTimeout(() => { setTimeout(async () => {
selectedObjects.value = copyObjects selectedObjects.value = copyObjects
selectedObjects.value['letterDate'] = letter.plannedDate selectedObjects.value['letterDate'] = letter.plannedDate
selectedObjects.value['cardNumber'] = letter.information?.cardNumber || '' selectedObjects.value['cardNumber'] = letter.information?.cardNumber || ''
@@ -385,11 +385,18 @@ async function handleEvent(menu: string, value: any) {
selectedObjects.value['patientName'] = letter.information?.patientName || '' selectedObjects.value['patientName'] = letter.information?.patientName || ''
selectedObjects.value['phoneNumber'] = letter.information?.patientPhone || '' selectedObjects.value['phoneNumber'] = letter.information?.patientPhone || ''
selectedObjects.value['facility'] = letter.information?.facility || '' selectedObjects.value['facility'] = letter.information?.facility || ''
selectedObjects.value['diagnoses'] = letter.information?.diagnoses || '' selectedObjects.value['diagnose'] = letter.information?.diagnose || ''
selectedObjects.value['serviceType'] = letter.information?.serviceType || '' selectedObjects.value['serviceType'] = letter.information?.serviceType || ''
selectedObjects.value['classLevel'] = letter.information?.classLevel || '' selectedObjects.value['classLevel'] = letter.information?.classLevel || ''
selectedObjects.value['poly'] = letter.information?.poly || '' selectedObjects.value['poly'] = letter.information?.poly || ''
selectedObjects.value['destination'] = letter.information?.destination || '' selectedObjects.value['destination'] = letter.information?.destination || ''
if (!!selectedObjects.value['diagnose']) {
const diagnoseRes: any = await getDiagnoseLabelList({ diagnosa: selectedObjects.value['diagnose'] })
diagnoses.value = diagnoseRes
if (diagnoseRes && diagnoseRes.length > 0) {
selectedObjects.value['diagnoseLabel'] = diagnoseRes[0].value
}
}
}, 250) }, 250)
} }
}) })
@@ -446,6 +453,9 @@ async function handleEvent(menu: string, value: any) {
if (!value.destinationClinic) { if (!value.destinationClinic) {
mappedValues.destinationClinic = selectedObjects.value['destination'] || '' mappedValues.destinationClinic = selectedObjects.value['destination'] || ''
} }
if (!value.clinicExcecutive) {
mappedValues.clinicExcecutive = 'no'
}
createSep(makeSepData(mappedValues)) createSep(makeSepData(mappedValues))
.then((res) => { .then((res) => {
@@ -18,9 +18,11 @@ useHead({
const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor'] const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
// const { checkRole, hasCreateAccess } = useRBAC() const { checkRole, hasCreateAccess } = useRBAC()
// // Check if user has access to this page console.log(checkRole(roleAccess))
// Check if user has access to this page
// const hasAccess = checkRole(roleAccess) // const hasAccess = checkRole(roleAccess)
// if (!hasAccess) { // if (!hasAccess) {
// throw createError({ // throw createError({
+1 -1
View File
@@ -89,7 +89,7 @@ const IntegrationBpjsSchema = z
cataract: z.string({ required_error: ERROR_MESSAGES.required.cataract }).min(1, ERROR_MESSAGES.required.cataract), cataract: z.string({ required_error: ERROR_MESSAGES.required.cataract }).min(1, ERROR_MESSAGES.required.cataract),
clinicExcecutive: z clinicExcecutive: z
.string({ required_error: ERROR_MESSAGES.required.clinicExcecutive }) .string({ required_error: ERROR_MESSAGES.required.clinicExcecutive })
.min(1, ERROR_MESSAGES.required.clinicExcecutive), .min(1, ERROR_MESSAGES.required.clinicExcecutive).optional(),
subSpecialistId: z subSpecialistId: z
.string({ required_error: ERROR_MESSAGES.required.subSpecialistId }) .string({ required_error: ERROR_MESSAGES.required.subSpecialistId })
.min(1, ERROR_MESSAGES.required.subSpecialistId) .min(1, ERROR_MESSAGES.required.subSpecialistId)