Merge branch 'dev' into feat/encounter

app/models/patient.ts

@@ -40,13 +40,35 @@ export interface genPatientProps {
 export function genPatientEntity(props: genPatientProps): PatientEntity {
   const { patient, residentAddress, cardAddress, familyData, contacts, responsible } = props
 
-  const addresses: PersonAddress[] = [{ ...genBase(), person_id: 0, locationType: '', ...residentAddress }]
+  const addresses: PersonAddress[] = [{ ...genBase(), person_id: 0, ...residentAddress }]
   const familiesContact: PersonRelative[] = []
   const personContacts: PersonContact[] = []
 
   // jika alamat ktp sama dengan domisili saat ini
-  if (cardAddress.isSameAddress === '1') {
-    addresses.push({ ...genBase(), person_id: 0, locationType: '', ...residentAddress })
+  if (cardAddress.isSameAddress) {
+    addresses.push({
+      ...genBase(),
+      ...residentAddress,
+      person_id: 0,
+      locationType_code: cardAddress.locationType_code || 'identity'
+    })
+  } else {
+    // jika alamat berbeda, tambahkan alamat relatif
+    // Pastikan semua field yang diperlukan ada
+    const relativeAddress = {
+      ...genBase(),
+      person_id: 0,
+      locationType_code: cardAddress.locationType_code || 'identity',
+      address: cardAddress.address || '',
+      province_code: cardAddress.province_code || '',
+      regency_code: cardAddress.regency_code || '',
+      district_code: cardAddress.district_code || '',
+      village_code: cardAddress.village_code || '',
+      postalRegion_code: cardAddress.postalRegion_code || '',
+      rt: cardAddress.rt,
+      rw: cardAddress.rw,
+    }
+    addresses.push(relativeAddress)
   }
 
   // add data orang tua
@@ -97,7 +119,7 @@ export function genPatientEntity(props: genPatientProps): PatientEntity {
     person: {
       id: 0,
       name: patient.fullName,
-      alias: patient.alias,
+      // alias: patient.alias,
       birthDate: patient.birthDate,
       birthRegency_code: patient.birthPlace,
       gender_code: patient.gender,
@@ -111,7 +133,7 @@ export function genPatientEntity(props: genPatientProps): PatientEntity {
       ethnic_code: patient.ethnicity,
       language_code: patient.language,
       communicationIssueStatus: patient.communicationBarrier,
-      disability: patient.disability,
+      disability: patient.disabilityType || '',
       nationality: patient.nationality,
       // residentIdentityFileUrl: patient.residentIdentityFileUrl,
       // passportFileUrl: patient.passportFileUrl,
@@ -126,17 +148,16 @@ export function genPatientEntity(props: genPatientProps): PatientEntity {
     personRelatives: familiesContact,
     registeredAt: new Date(),
     status_code: 'active',
-    newBornStatus: false,
+    newBornStatus: patient.isNewBorn,
     person_id: 0,
     id: 0,
-    number: '0x000000000000000000000000000000',
+    number: '',
     createdAt: new Date().toISOString(),
     updatedAt: new Date().toISOString(),
     deletedAt: null,
   }
 }
 
-
 // New model
 export interface Patient extends Base {
   person_id?: number