Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/assessment-adjustment-223

This commit is contained in:
Abizrh
2025-12-09 23:26:37 +07:00
15 changed files with 647 additions and 170 deletions
+4 -4
View File
@@ -539,7 +539,7 @@ export function useEncounterEntry(props: {
class_code: props.classCode || '',
subClass_code: props.subClassCode || '',
infra_id: formValues.infra_id ?? null,
unit_code: userStore?.user?.unit_code ?? null,
unit_code: formValues.unitCode ?? userStore?.user?.unit_code ?? null,
refSource_name: formValues.refSource_name ?? 'RSSA',
refTypeCode: formValues.paymentType === 'jkn' ? 'bpjs' : '',
vclaimReference: vclaimReference.value ?? null,
@@ -547,7 +547,7 @@ export function useEncounterEntry(props: {
registeredAt: formatDate(registeredAtValue),
visitDate: formatDate(visitDateValue),
}
if (props.classCode !== 'inpatient') {
delete payload.infra_id
}
@@ -599,7 +599,7 @@ export function useEncounterEntry(props: {
if (encounterId) {
if (sepFile.value) {
await uploadAttachmentCustom({
id: isEditMode.value && formValues.sepFileReview ? formValues.sepFileReview.id : null,
// id: isEditMode.value && formValues.sepFileReview ? formValues.sepFileReview.id : null,
file: sepFile.value,
refId: encounterId,
entityTypeCode: 'encounter',
@@ -608,7 +608,7 @@ export function useEncounterEntry(props: {
}
if (sippFile.value) {
await uploadAttachmentCustom({
id: isEditMode.value && formValues.sippFileReview ? formValues.sippFileReview.id : null,
// id: isEditMode.value && formValues.sippFileReview ? formValues.sippFileReview.id : null,
file: sippFile.value,
refId: encounterId,
entityTypeCode: 'encounter',
+4 -1
View File
@@ -27,6 +27,9 @@ export async function uploadAttachmentCustom(payload: any) {
const { user } = useUserStore()
const formData = new FormData()
if (!payload.id && payload.name) {
formData.append('name', payload.name)
}
formData.append('content', payload.file)
formData.append('entityType_code', payload.entityTypeCode)
formData.append('type_code', payload.type)
@@ -34,5 +37,5 @@ export async function uploadAttachmentCustom(payload: any) {
formData.append('upload_employee_id', user.employee_id)
const response = payload.id ? await update(payload.id, formData) : await create(formData)
return response?.body?.data
return response
}