@andes/fhir 1.13.0-beta.8 → 1.13.0

package/dist/lib/immunization.js

@@ -8,59 +8,72 @@ exports.encode = encode;
  * [ASk] Location no se sabe. Solo esta el texto
  */
 function encode(patientReference, nomivac) {
-    return {
+    const occurrenceDate = nomivac.fechaAplicacion
+        ? new Date(nomivac.fechaAplicacion).toISOString()
+        : new Date().toISOString();
+    const immunization = {
         resourceType: 'Immunization',
-        id: nomivac.idvacuna,
-        extension: [
-            {
-                url: 'http://sisa/fhir/esquema',
-                valueCoding: {
-                    system: 'http://argentina.gob.ar/salud/NOMIVAC-esquemas',
-                    code: '0', // [TODO] Ver que code ponemos acá
-                    display: nomivac.vacuna
-                }
-            },
-            {
-                url: 'http://sisa/fhir/condicionAplicacion',
-                valueCoding: {
-                    system: 'http://argentina.gob.ar/salud/NOMIVAC-condicion',
-                    code: '17',
-                    display: 'Personal de Salud'
-                }
-            }
-        ],
+        id: String(nomivac.idvacuna),
+        meta: {
+            profile: [
+                'http://hl7.org/fhir/uv/ips/StructureDefinition/Immunization-uv-ips'
+            ]
+        },
+        text: {
+            status: 'generated',
+            div: `<div xmlns="http://www.w3.org/1999/xhtml"><p>${nomivac.vacuna || 'Vacuna'}</p></div>`
+        },
         status: 'completed',
-        notGiven: false,
         vaccineCode: {
             coding: [
                 {
                     system: 'https://snomed.info/sct/11000221109/id/228100022110',
-                    code: nomivac.idvacuna,
+                    code: String(nomivac.idvacuna),
                     display: nomivac.vacuna
                 }
-            ]
+            ],
+            text: nomivac.vacuna
         },
         patient: {
             reference: patientReference
         },
-        date: nomivac.fechaAplicacion,
-        primarySource: false,
-        location: {
+        occurrenceDateTime: occurrenceDate,
+        primarySource: false
+    };
+    if (nomivac.vacuna || nomivac.condicion) {
+        immunization.extension = [];
+        if (nomivac.vacuna) {
+            immunization.extension.push({
+                url: 'http://sisa/fhir/esquema',
+                valueCoding: {
+                    system: 'http://argentina.gob.ar/salud/NOMIVAC-esquemas',
+                    code: '0',
+                    display: nomivac.vacuna
+                }
+            });
+        }
+        if (nomivac.condicion) {
+            immunization.extension.push({
+                url: 'http://sisa/fhir/condicionAplicacion',
+                valueCoding: {
+                    system: 'http://argentina.gob.ar/salud/NOMIVAC-condicion',
+                    code: '17',
+                    display: 'Personal de Salud'
+                }
+            });
+        }
+    }
+    if (nomivac.location) {
+        immunization.location = {
             reference: 'http://argentina.gob.ar/salud/refes/14999912399913'
-        },
-        // lotNumber: null,
-        vaccinationProtocol: [
+        };
+    }
+    if (nomivac.dosis) {
+        immunization.protocolApplied = [
             {
-                doseSequence: 1,
-                doseStatus: {
-                    coding: [
-                        {
-                            system: 'http://hl7.org/fhir/vaccination-protocol-dose-status',
-                            code: nomivac.dosis
-                        }
-                    ]
-                }
+                doseNumberString: String(nomivac.dosis)
             }
-        ]
-    };
+        ];
+    }
+    return immunization;
 }

package/dist/lib/medicationStatement.js

@@ -23,7 +23,7 @@ function encode(patientReference, medicationReference, prestacionMedicamento) {
         },
         meta: {
             profile: [
-                'http://hl7.org/fhir/uv/ips/StructureDefinition/medication-ips'
+                'http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationStatement-uv-ips'
             ]
         },
         // extension: null,

package/dist/lib/organization.js

@@ -63,18 +63,35 @@ function encode(organization) {
     const direcciones = [];
     if (data.direccion) {
         const dir = data.direccion;
-        direcciones.push({
-            postalCode: dir.codigoPostal ?? '',
-            line: [dir.valor],
-            city: dir.ubicacion?.localidad?.nombre ?? '',
-            state: dir.ubicacion?.provincia?.nombre ?? '',
-            country: dir.ubicacion?.pais?.nombre ?? ''
-        });
+        const address = {};
+        const city = dir.ubicacion?.localidad?.nombre;
+        const state = dir.ubicacion?.provincia?.nombre;
+        const country = dir.ubicacion?.pais?.nombre;
+        if (dir.valor?.trim()) {
+            address.line = [dir.valor.trim()];
+        }
+        if (dir.codigoPostal && String(dir.codigoPostal).trim()) {
+            address.postalCode = String(dir.codigoPostal).trim();
+        }
+        if (city?.trim()) {
+            address.city = city.trim();
+        }
+        if (state?.trim()) {
+            address.state = state.trim();
+        }
+        if (country?.trim()) {
+            address.country = country.trim();
+        }
+        direcciones.push(address);
     }
     // Organización FHIR
     const organizacionFHIR = {
         resourceType: 'Organization',
         id: data._id ?? data.id,
+        text: {
+            status: 'generated',
+            div: `<div xmlns="http://www.w3.org/1999/xhtml"><p>${data.nombre || 'Organización'}</p></div>`
+        },
         identifier: identificadores,
         active: data.activo ?? undefined,
         name: data.nombre ?? undefined,

package/dist/lib/patient.js

@@ -175,13 +175,23 @@ function encode(patient) {
         const country = typeof unaDireccion.ubicacion.pais === 'object'
             ? unaDireccion.ubicacion.pais?.nombre
             : unaDireccion.ubicacion.pais;
-        return {
-            postalCode: unaDireccion.codigoPostal ?? '',
-            line: [unaDireccion.valor],
-            city: city ?? '',
-            state: state ?? '',
-            country: country ?? ''
-        };
+        const address = {};
+        if (unaDireccion.valor?.trim()) {
+            address.line = [unaDireccion.valor.trim()];
+        }
+        if (unaDireccion.codigoPostal && String(unaDireccion.codigoPostal).trim()) {
+            address.postalCode = String(unaDireccion.codigoPostal).trim();
+        }
+        if (city?.trim()) {
+            address.city = city.trim();
+        }
+        if (state?.trim()) {
+            address.state = state.trim();
+        }
+        if (country?.trim()) {
+            address.country = country.trim();
+        }
+        return address;
     });
     // Relaciones → contact
     const relacionesFHIR = (patient.relaciones ?? [])
@@ -207,6 +217,10 @@ function encode(patient) {
     const pacienteFHIR = {
         resourceType: 'Patient',
         id: patient._id ?? patient.id,
+        text: {
+            status: 'generated',
+            div: `<div xmlns="http://www.w3.org/1999/xhtml"><p>${`${patient.nombre || ''} ${patient.apellido || ''}`.trim()}</p></div>`
+        },
         identifier: identificadores,
         active: patient.activo ?? undefined,
         name: [{

package/dist/lib/practitioner.js

@@ -52,13 +52,26 @@ function encode(practitioner) {
     // Direcciones → address
     // -----------------------------
     const direcciones = (data.domicilios ?? []).map((unDomicilio) => {
-        return {
-            postalCode: unDomicilio.codigoPostal ?? '',
-            line: [unDomicilio.valor],
-            city: unDomicilio.ubicacion?.localidad?.nombre ?? '',
-            state: unDomicilio.ubicacion?.provincia?.nombre ?? '',
-            country: unDomicilio.ubicacion?.pais?.nombre ?? ''
-        };
+        const address = {};
+        const city = unDomicilio.ubicacion?.localidad?.nombre;
+        const state = unDomicilio.ubicacion?.provincia?.nombre;
+        const country = unDomicilio.ubicacion?.pais?.nombre;
+        if (unDomicilio.valor?.trim()) {
+            address.line = [unDomicilio.valor.trim()];
+        }
+        if (unDomicilio.codigoPostal && String(unDomicilio.codigoPostal).trim()) {
+            address.postalCode = String(unDomicilio.codigoPostal).trim();
+        }
+        if (city?.trim()) {
+            address.city = city.trim();
+        }
+        if (state?.trim()) {
+            address.state = state.trim();
+        }
+        if (country?.trim()) {
+            address.country = country.trim();
+        }
+        return address;
     });
     // -----------------------------
     // Relaciones (hoy no se usan en Practitioner)

package/package.json

@@ -1,6 +1,9 @@
 {
     "name": "@andes/fhir",
-    "version": "1.13.0-beta.8",
+    "publishConfig": {
+        "access": "public"
+    },
+    "version": "1.13.0",
     "engines": {
         "node": ">=24.0.0"
     },
@@ -51,4 +54,4 @@
             }
         ]
     }
-}
+}