@andes/fhir 1.12.1-beta.7 → 1.13.0-beta.10

package/dist/constants/identifier-systems.d.ts

@@ -0,0 +1,13 @@
+export declare const FhirIdentifierSystems: {
+    readonly ANDES_ID: "http://andes.gob.ar";
+    readonly MATRICULACIONES: "http://andes.gob.ar/matriculaciones";
+    readonly DNI: "https://www.renaper.gob.ar/dni";
+    readonly CUIL: "https://www.anses.org.ar/cuil";
+    readonly PASSPORT: "http://andes.gob.ar/sid/passport";
+    readonly FOREIGN_ID: "http://andes.gob.ar/sid/foreign-id";
+    readonly PRESCRIPTIONS: "http://app.andes.gob.ar/prescriptions";
+    readonly SISA: "https://andes.gob.ar/sisa";
+    readonly CUIE: "https://andes.gob.ar/cuie";
+    readonly REMEDIAR: "https://andes.gob.ar/remediar";
+    readonly SIPS: "https://andes.gob.ar/sips";
+};

package/dist/constants/identifier-systems.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FhirIdentifierSystems = void 0;
+exports.FhirIdentifierSystems = {
+    ANDES_ID: 'http://andes.gob.ar',
+    MATRICULACIONES: 'http://andes.gob.ar/matriculaciones',
+    DNI: 'https://www.renaper.gob.ar/dni',
+    CUIL: 'https://www.anses.org.ar/cuil',
+    PASSPORT: 'http://andes.gob.ar/sid/passport',
+    FOREIGN_ID: 'http://andes.gob.ar/sid/foreign-id',
+    PRESCRIPTIONS: 'http://app.andes.gob.ar/prescriptions',
+    SISA: 'https://andes.gob.ar/sisa',
+    CUIE: 'https://andes.gob.ar/cuie',
+    REMEDIAR: 'https://andes.gob.ar/remediar',
+    SIPS: 'https://andes.gob.ar/sips',
+};

package/dist/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllergyIntolerance = exports.MedicationRequest = exports.MedicationStatement = exports.Medication = exports.Device = exports.DocumentReference = exports.Bundle = exports.Composition = exports.Condition = exports.Immunization = exports.Organization = exports.Practitioner = exports.Patient = exports.initialize = exports.getDominio = void 0;
 const AllergyIntolerance = __importStar(require("./lib/allergyIntolerance"));

package/dist/lib/allergyIntolerance.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 /**
  * Encode de Alergias e Intolerancias from ANDES to FHIR
  * @param {} AllergyIntolerance
@@ -36,4 +36,3 @@ function encode(patientReference, alergiaIntolerancia) {
         onsetDateTime: alergiaIntolerancia.valor.fechaInicio
     };
 }
-exports.encode = encode;

package/dist/lib/bundle.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
-const moment_1 = __importDefault(require("moment"));
+exports.encode = encode;
 const config_1 = require("./config");
 function encode(ID, resources) {
     return {
         resourceType: 'Bundle',
         id: ID,
         meta: {
-            lastUpdated: (0, moment_1.default)().format()
+            lastUpdated: new Date().toISOString()
         },
         language: 'es-AR',
         entry: resources,
@@ -22,4 +18,3 @@ function encode(ID, resources) {
         }
     };
 }
-exports.encode = encode;

package/dist/lib/composition.d.ts

@@ -1,4 +1,3 @@
-import moment from 'moment';
 export declare function encode(ID: any, patientReference: any, custodianReference: any, deviceReference: any, medicationStatementReference: any, ImmunizationReferences: any, AllergyIntoleranceReferences: any, ConditionReferences: any): {
     id: any;
     subject: {
@@ -25,7 +24,7 @@ export declare function encode(ID: any, patientReference: any, custodianReferenc
         system: string;
         value: any;
     };
-    date: moment.Moment;
+    date: string;
     text: {
         status: string;
         div: string;
@@ -38,7 +37,7 @@ export declare function encode(ID: any, patientReference: any, custodianReferenc
     };
     attester: {
         mode: string;
-        time: moment.Moment;
+        time: string;
         party: {
             reference: any;
         };

package/dist/lib/composition.js

@@ -1,11 +1,7 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
-const moment_1 = __importDefault(require("moment"));
+exports.encode = encode;
 const config_1 = require("./config");
 function getReference(url) {
     return {
@@ -13,7 +9,8 @@ function getReference(url) {
     };
 }
 function encode(ID, patientReference, custodianReference, deviceReference, medicationStatementReference, ImmunizationReferences, AllergyIntoleranceReferences, ConditionReferences) {
-    const now = (0, moment_1.default)();
+    const now = new Date();
+    const nowIso = now.toISOString();
     let Immunization = [];
     let conditions = [];
     let medications = [];
@@ -116,12 +113,12 @@ function encode(ID, patientReference, custodianReference, deviceReference, medic
                 }
             ]
         },
-        title: 'Resumen del paciente al ' + now.format('DD/MM/YYYY, HH:mm'),
+        title: 'Resumen del paciente al ' + now.toLocaleDateString('es-AR') + ', ' + now.toLocaleTimeString('es-AR', { hour: '2-digit', minute: '2-digit' }),
         identifier: {
             system: (0, config_1.makeUrl)('Composition'),
             value: ID
         },
-        date: now,
+        date: nowIso,
         // meta: {
         //     profile: [
         //         'http:\/\/hl7.org\/fhir\/uv\/ips\/StructureDefinition\/composition-uv-ips'
@@ -140,7 +137,7 @@ function encode(ID, patientReference, custodianReference, deviceReference, medic
         attester: [
             {
                 mode: 'legal',
-                time: now,
+                time: nowIso,
                 party: {
                     reference: custodianReference
                 }
@@ -149,4 +146,3 @@ function encode(ID, patientReference, custodianReference, deviceReference, medic
         status: 'final'
     };
 }
-exports.encode = encode;

package/dist/lib/condition.js

@@ -4,7 +4,7 @@
  * @param registro Registro RUP a transformar a FHIR
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 function encode(patientReference, registro) {
     return {
         id: registro._id,
@@ -76,4 +76,3 @@ function encode(patientReference, registro) {
         }
     };
 }
-exports.encode = encode;

package/dist/lib/config.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__reset = exports.makeUrl = exports.getDominio = exports.initialize = void 0;
-let DOMINIO = 'andes.gob.ar';
+exports.initialize = initialize;
+exports.getDominio = getDominio;
+exports.makeUrl = makeUrl;
+exports.__reset = __reset;
+const identifier_systems_1 = require("../constants/identifier-systems");
+let DOMINIO = identifier_systems_1.FhirIdentifierSystems.ANDES_ID;
 function initialize(config) {
     DOMINIO = config.dominio;
 }
-exports.initialize = initialize;
 function getDominio() {
     return DOMINIO;
 }
-exports.getDominio = getDominio;
 function makeUrl(resource, id) {
     let url = `${DOMINIO}/${resource}`;
     if (id) {
@@ -17,11 +19,9 @@ function makeUrl(resource, id) {
     }
     return url;
 }
-exports.makeUrl = makeUrl;
 /**
  * Reseteo explícito para tests
  */
 function __reset() {
-    DOMINIO = 'andes.gob.ar';
+    DOMINIO = identifier_systems_1.FhirIdentifierSystems.ANDES_ID;
 }
-exports.__reset = __reset;

package/dist/lib/device.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 const config_1 = require("./config");
 function encode() {
     /**
@@ -35,4 +35,3 @@ function encode() {
         ]
     };
 }
-exports.encode = encode;

package/dist/lib/document-reference.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
-const moment_1 = __importDefault(require("moment"));
+exports.encode = encode;
 const config_1 = require("./config");
 function encode(ID, author, organization, patient, binaryURL) {
     return {
         resourceType: 'DocumentReference',
         id: ID,
         meta: {
-            lastUpdated: (0, moment_1.default)().format()
+            lastUpdated: new Date().toISOString()
         },
         contained: [
             {
@@ -103,4 +99,3 @@ function encode(ID, author, organization, patient, binaryURL) {
         }
     };
 }
-exports.encode = encode;

package/dist/lib/immunization.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 /**
  * Encode de Vacunas Nomivac from ANDES to FHIR
  * @param {} nomivac
@@ -64,4 +64,3 @@ function encode(patientReference, nomivac) {
         ]
     };
 }
-exports.encode = encode;

package/dist/lib/medication.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 /**
  * Encode de Medicamentos from ANDES to FHIR
  * @param {} medication
@@ -61,4 +61,3 @@ function encode(medication) {
         }
     };
 }
-exports.encode = encode;

package/dist/lib/medicationRequest.d.ts

@@ -11,7 +11,7 @@ export declare function encode(patientReference: any, practitionerReference: any
     contained: any[];
     identifier: {
         use: string;
-        system: string;
+        system: "http://app.andes.gob.ar/prescriptions";
         value: any;
     }[];
     status: string;
@@ -25,7 +25,7 @@ export declare function encode(patientReference: any, practitionerReference: any
     subject: {
         reference: any;
     };
-    authoredOn: string;
+    authoredOn: string | undefined;
     requester: {
         reference: any;
     };

package/dist/lib/medicationRequest.js

@@ -3,12 +3,9 @@
  * Encode medicationRequest from ANDES to FHIR
  * @param {} medicationRequest
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
-const moment_1 = __importDefault(require("moment"));
+exports.encode = encode;
+const identifier_systems_1 = require("../constants/identifier-systems");
 // Muy incompleto hay que mejorarlo mucho todavía
 function encode(patientReference, practitionerReference, medicationFHIR, data) {
     return {
@@ -24,7 +21,7 @@ function encode(patientReference, practitionerReference, medicationFHIR, data) {
         identifier: [
             {
                 use: 'official',
-                system: 'http://app.andes.gob.ar/prescriptions', // Es el id de la prestación completa
+                system: identifier_systems_1.FhirIdentifierSystems.PRESCRIPTIONS, // Es el id de la prestación completa
                 value: data.registro.id
             }
         ],
@@ -53,7 +50,7 @@ function encode(patientReference, practitionerReference, medicationFHIR, data) {
             reference: patientReference // podría ser una reference a un group también
         },
         // encounter: Por ahora lo dejo pendiente. Podría ponerse una referencia a otra prestación o al informe del encuentro.
-        authoredOn: (0, moment_1.default)(data.registro.createdAt).format('YYYY-MM-DD'),
+        authoredOn: data.registro?.createdAt ? new Date(data.registro.createdAt).toISOString().slice(0, 10) : undefined,
         // requester & performer: pueden ser  Reference(Practitioner|PractitionerRole|Organization|Patient|Device|RelatedPerson|CareTeam)
         // por el momento vamos a tomar al profesional porque no tenemos otra info en la prestación
         requester: {
@@ -100,4 +97,3 @@ function encode(patientReference, practitionerReference, medicationFHIR, data) {
         eventHistory: null // [{ Reference(Provenance) }]
     };
 }
-exports.encode = encode;

package/dist/lib/medicationStatement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 /**
  * Encode de Medicamentos from ANDES to FHIR
  * @param {} medicationStatement
@@ -52,4 +52,3 @@ function encode(patientReference, medicationReference, prestacionMedicamento) {
         }
     };
 }
-exports.encode = encode;

package/dist/lib/organization.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 const config_1 = require("./config");
+const rankingMapping_1 = require("../utils/rankingMapping");
+const identifier_systems_1 = require("../constants/identifier-systems");
 /**
  * Encode an ANDES Organization to FHIR Organization
  */
@@ -13,25 +15,25 @@ function encode(organization) {
     const identificadores = [];
     if (data.codigo?.sisa) {
         identificadores.push({
-            system: 'andes.gob.ar/sisa',
+            system: identifier_systems_1.FhirIdentifierSystems.SISA,
             value: data.codigo.sisa
         });
     }
     if (data.codigo?.cuie) {
         identificadores.push({
-            system: 'andes.gob.ar/cuie',
+            system: identifier_systems_1.FhirIdentifierSystems.CUIE,
             value: data.codigo.cuie
         });
     }
     if (data.codigo?.remediar) {
         identificadores.push({
-            system: 'andes.gob.ar/remediar',
+            system: identifier_systems_1.FhirIdentifierSystems.REMEDIAR,
             value: data.codigo.remediar
         });
     }
     if (data.codigo?.sips) {
         identificadores.push({
-            system: 'andes.gob.ar/sips',
+            system: identifier_systems_1.FhirIdentifierSystems.SIPS,
             value: data.codigo.sips
         });
     }
@@ -44,7 +46,7 @@ function encode(organization) {
         .map((item) => {
         const cp = {
             value: item.valor,
-            rank: item.ranking
+            rank: (0, rankingMapping_1.mapAndesRankingToFhirRank)(item.ranking)
         };
         switch (item.tipo) {
             case 'fijo':
@@ -90,4 +92,3 @@ function encode(organization) {
     }
     return organizacionFHIR;
 }
-exports.encode = encode;

package/dist/lib/patient.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verify = exports.decode = exports.encode = void 0;
+exports.encode = encode;
+exports.decode = decode;
+exports.verify = verify;
 const config_1 = require("./config");
+const rankingMapping_1 = require("../utils/rankingMapping");
+const identifier_systems_1 = require("../constants/identifier-systems");
 /**
  * Helpers
  */
@@ -99,16 +103,6 @@ function mapEstadoCivilFHIRToAndes(estadoCivil) {
             return 'otro';
     }
 }
-function mapAndesRankingToFhirRank(andesRanking) {
-    return typeof andesRanking === 'number' && Number.isInteger(andesRanking) && andesRanking >= 0
-        ? andesRanking + 1
-        : 1;
-}
-function mapFhirRankToAndesRanking(fhirRank) {
-    return typeof fhirRank === 'number' && Number.isInteger(fhirRank) && fhirRank > 0
-        ? fhirRank - 1
-        : 0;
-}
 /**
  * Encode a patient from ANDES to FHIR
  */
@@ -125,26 +119,26 @@ function encode(patient) {
     });
     if (patient.documento) {
         identificadores.push({
-            system: 'http://www.renaper.gob.ar/dni',
+            system: identifier_systems_1.FhirIdentifierSystems.DNI,
             value: patient.documento
         });
     }
     if (patient.cuil) {
         identificadores.push({
-            system: 'http://www.renaper.gob.ar/cuil',
+            system: identifier_systems_1.FhirIdentifierSystems.CUIL,
             value: patient.cuil
         });
     }
     if (patient.numeroIdentificacion) {
         if (patient.tipoIdentificacion === 'dni extranjero') {
             identificadores.push({
-                system: 'andes.gob.ar/sid/foreign-id',
+                system: identifier_systems_1.FhirIdentifierSystems.FOREIGN_ID,
                 value: patient.numeroIdentificacion
             });
         }
         if (patient.tipoIdentificacion === 'pasaporte') {
             identificadores.push({
-                system: 'andes.gob.ar/sid/passport',
+                system: identifier_systems_1.FhirIdentifierSystems.PASSPORT,
                 value: patient.numeroIdentificacion
             });
         }
@@ -155,7 +149,7 @@ function encode(patient) {
         .map((unContacto) => {
         const cont = {
             value: unContacto.valor,
-            rank: mapAndesRankingToFhirRank(unContacto.ranking)
+            rank: (0, rankingMapping_1.mapAndesRankingToFhirRank)(unContacto.ranking)
         };
         switch (unContacto.tipo) {
             case 'fijo':
@@ -257,7 +251,6 @@ function encode(patient) {
     }
     return pacienteFHIR;
 }
-exports.encode = encode;
 /**
  * Decode a patient from FHIR to ANDES
  */
@@ -273,7 +266,7 @@ function decode(patient) {
         const element = items.find(el => el.system === key);
         return element?.value;
     }
-    const tiposIdentificacion = ['andes.gob.ar/sid/foreign-id', 'andes.gob.ar/sid/passport'];
+    const tiposIdentificacion = [identifier_systems_1.FhirIdentifierSystems.FOREIGN_ID, identifier_systems_1.FhirIdentifierSystems.PASSPORT];
     const tipoAndes = ['dni extranjero', 'pasaporte'];
     let tipoIdentificacion;
     let numeroIdentificacion;
@@ -295,7 +288,7 @@ function decode(patient) {
         : '';
     const pacienteAndes = {
         id: getValue(patient.identifier, (0, config_1.makeUrl)('Patient')) ?? patient.id,
-        documento: getValue(patient.identifier, 'http://www.renaper.gob.ar/dni'),
+        documento: getValue(patient.identifier, identifier_systems_1.FhirIdentifierSystems.DNI),
         tipoIdentificacion,
         numeroIdentificacion,
         nombre,
@@ -309,7 +302,7 @@ function decode(patient) {
         ? patient.telecom.map((unContacto) => {
             const cont = {
                 valor: unContacto.value,
-                ranking: mapFhirRankToAndesRanking(unContacto.rank)
+                ranking: (0, rankingMapping_1.mapFhirRankToAndesRanking)(unContacto.rank)
             };
             switch (unContacto.system) {
                 case 'phone':
@@ -380,7 +373,6 @@ function decode(patient) {
     }
     return pacienteAndes;
 }
-exports.decode = decode;
 /**
  * Verify if a patient has a FHIR format
  */
@@ -449,7 +441,6 @@ function verify(patient) {
     }
     return respuesta;
 }
-exports.verify = verify;
 /**
  * Verify helpers
  */

package/dist/lib/practitioner.d.ts

@@ -1,6 +1,3 @@
 import { Practitioner } from 'fhir/r4';
 import { AndesPractitioner } from '../types/andes/practitioner.types';
-/**
- * Encode a practitioner from ANDES to FHIR
- */
 export declare function encode(practitioner: AndesPractitioner | null | undefined): Practitioner | null;

package/dist/lib/practitioner.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encode = void 0;
+exports.encode = encode;
 const config_1 = require("./config");
-/**
- * Encode a practitioner from ANDES to FHIR
- */
+const fhirDate_1 = require("../utils/fhirDate");
+const rankingMapping_1 = require("../utils/rankingMapping");
 function encode(practitioner) {
     const data = practitioner;
     if (!data) {
@@ -36,7 +35,7 @@ function encode(practitioner) {
     const contactos = (data.contacto ?? []).map((unContacto) => {
         const cont = {
             value: unContacto.valor,
-            rank: unContacto.ranking
+            rank: (0, rankingMapping_1.mapAndesRankingToFhirRank)(unContacto.ranking)
         };
         switch (unContacto.tipo) {
             case 'fijo':
@@ -78,7 +77,7 @@ function encode(practitioner) {
             identifier: datosGrado.profesion.nombre
                 ? [{
                         system: 'https://www.saludneuquen.gob.ar/matriculacionGrado',
-                        value: datosGrado.profesion.nombre
+                        value: String(datosGrado.profesion.nombre ?? '')
                     }]
                 : []
         };
@@ -86,15 +85,22 @@ function encode(practitioner) {
             unaMatricula.code = {
                 coding: [{
                         system: 'http://www.saludneuquen.gob.ar/fiscalizacion.html',
-                        code: datosGrado.profesion.codigo,
-                        display: datosGrado.profesion.tipoDeFormacion
+                        code: String(datosGrado.profesion.codigo ?? ''),
+                        display: String(datosGrado.profesion.tipoDeFormacion ?? '')
                     }],
-                text: ultima.matriculaNumero
-            };
-            unaMatricula.period = {
-                start: ultima.inicio ?? null,
-                end: ultima.fin ?? null
+                text: String(ultima.matriculaNumero ?? '')
             };
+            const start = (0, fhirDate_1.formatFHIRDateTime)(ultima.inicio);
+            const end = (0, fhirDate_1.formatFHIRDateTime)(ultima.fin);
+            if (start || end) {
+                unaMatricula.period = {};
+                if (start) {
+                    unaMatricula.period.start = start;
+                }
+                if (end) {
+                    unaMatricula.period.end = end;
+                }
+            }
         }
         return unaMatricula;
     });
@@ -110,7 +116,7 @@ function encode(practitioner) {
             identifier: datosPosgrado.especialidad.nombre
                 ? [{
                         system: 'https://www.saludneuquen.gob.ar/matriculacionEspecialidad/',
-                        value: datosPosgrado.especialidad.nombre
+                        value: String(datosPosgrado.especialidad.nombre ?? '')
                     }]
                 : []
         };
@@ -118,15 +124,22 @@ function encode(practitioner) {
             unaMatricula.code = {
                 coding: [{
                         system: 'http://www.saludneuquen.gob.ar/fiscalizacion.html',
-                        code: datosPosgrado.especialidad.codigo,
-                        display: datosPosgrado.especialidad.tipo
+                        code: String(datosPosgrado.especialidad.codigo.sisa ?? ''),
+                        display: String(datosPosgrado.especialidad.nombre ?? '')
                     }],
-                text: ultima.matriculaNumero
-            };
-            unaMatricula.period = {
-                start: ultima.inicio ?? null,
-                end: ultima.fin ?? null
+                text: String(ultima.matriculaNumero ?? '')
             };
+            const start = (0, fhirDate_1.formatFHIRDateTime)(ultima.inicio);
+            const end = (0, fhirDate_1.formatFHIRDateTime)(ultima.fin);
+            if (start || end) {
+                unaMatricula.period = {};
+                if (start) {
+                    unaMatricula.period.start = start;
+                }
+                if (end) {
+                    unaMatricula.period.end = end;
+                }
+            }
         }
         return unaMatricula;
     });
@@ -155,6 +168,7 @@ function encode(practitioner) {
     // -----------------------------
     const profesionalFHIR = {
         resourceType: 'Practitioner',
+        id: data._id,
         identifier: identificadores,
         active: data.habilitado ?? undefined,
         name: [{
@@ -162,7 +176,7 @@ function encode(practitioner) {
                 given: data.nombre?.split(' ') ?? []
             }],
         gender: genero,
-        birthDate: data.fechaNacimiento,
+        birthDate: (0, fhirDate_1.formatFHIRDate)(data.fechaNacimiento),
     };
     if (contactos.length > 0) {
         profesionalFHIR.telecom = contactos;
@@ -183,4 +197,3 @@ function encode(practitioner) {
     }
     return profesionalFHIR;
 }
-exports.encode = encode;

package/dist/types/andes/practitioner.types.d.ts

@@ -43,8 +43,9 @@ export interface AndesProfesion {
 }
 export interface AndesEspecialidad {
     nombre?: string;
-    codigo?: string;
-    tipo?: string;
+    codigo: {
+        sisa: string;
+    };
 }
 export interface AndesFormacionGrado {
     profesion: AndesProfesion;

package/dist/utils/fhirDate.d.ts

@@ -0,0 +1,3 @@
+export declare function isValidFHIRDateTime(date: any): boolean;
+export declare function formatFHIRDateTime(date: any): string | undefined;
+export declare function formatFHIRDate(date: any): string | undefined;

package/dist/utils/fhirDate.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidFHIRDateTime = isValidFHIRDateTime;
+exports.formatFHIRDateTime = formatFHIRDateTime;
+exports.formatFHIRDate = formatFHIRDate;
+function isValidFHIRDateTime(date) {
+    if (date === null || date === undefined || date === 0 || date === '0' || date === '') {
+        return false;
+    }
+    const d = new Date(date);
+    return !isNaN(d.getTime());
+}
+function formatFHIRDateTime(date) {
+    if (isValidFHIRDateTime(date)) {
+        return new Date(date).toISOString();
+    }
+    return undefined;
+}
+function formatFHIRDate(date) {
+    if (isValidFHIRDateTime(date)) {
+        return new Date(date).toISOString().split('T')[0];
+    }
+    return undefined;
+}

package/dist/utils/rankingMapping.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Mapea ANDES ranking base 1 a FHIR rank base 1
+ */
+export declare function mapAndesRankingToFhirRank(andesRanking?: number): number;
+/**
+ * Mapea FHIR rank base 1 a ANDES ranking base 0
+ */
+export declare function mapFhirRankToAndesRanking(fhirRank?: number): number;

package/dist/utils/rankingMapping.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapAndesRankingToFhirRank = mapAndesRankingToFhirRank;
+exports.mapFhirRankToAndesRanking = mapFhirRankToAndesRanking;
+/**
+ * Mapea ANDES ranking base 1 a FHIR rank base 1
+ */
+function mapAndesRankingToFhirRank(andesRanking) {
+    return typeof andesRanking === 'number' && Number.isInteger(andesRanking) && andesRanking >= 0
+        ? andesRanking + 1
+        : 1;
+}
+/**
+ * Mapea FHIR rank base 1 a ANDES ranking base 0
+ */
+function mapFhirRankToAndesRanking(fhirRank) {
+    return typeof fhirRank === 'number' && Number.isInteger(fhirRank) && fhirRank > 0
+        ? fhirRank - 1
+        : 0;
+}

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@andes/fhir",
-    "version": "1.12.1-beta.7",
+    "version": "1.13.0-beta.10",
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=24.0.0"
     },
     "engineStrict": true,
     "main": "dist/index.js",
@@ -21,22 +21,20 @@
         "release:prod:dry": "dotenv -e .env -- semantic-release --no-ci --branches master --dry-run"
     },
     "devDependencies": {
-        "@types/jest": "29.5.14",
-        "@types/node": "^18.19.0",
-        "@typescript-eslint/eslint-plugin": "^6.21.0",
-        "@typescript-eslint/parser": "^6.21.0",
+        "@types/jest": "^29.5.14",
+        "@types/node": "^24.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.26.0",
+        "@typescript-eslint/parser": "^8.26.0",
         "dotenv-cli": "^11.0.0",
-        "eslint": "^8.57.0",
-        "jest": "29.7.0",
+        "eslint": "^9.21.0",
+        "jest": "^29.7.0",
         "rimraf": "^5.0.7",
         "semantic-release": "^20.1.0",
-        "ts-jest": "29.2.5",
-        "ts-node": "^10.9.2",
-        "typescript": "5.3.3"
+        "ts-jest": "^29.2.5",
+        "typescript": "^5.8.2"
     },
     "dependencies": {
-        "@types/fhir": "^0.0.41",
-        "moment": "2.29.4"
+        "@types/fhir": "^0.0.41"
     },
     "files": [
         "dist/**/*"

package/dist/data/patient.json

@@ -1,192 +0,0 @@
-{
-    "_id": "58d30d6fgbb1a96b254d9877",
-    "entidadesValidadoras": [
-        "RENAPER",
-        "Sisa"
-    ],
-    "documento": "42910660",
-    "apellido": "PERINGA PONCE",
-    "nombre": "HUGO AGUSTIN",
-    "sexo": "masculino",
-    "fechaNacimiento": "1979-11-14T03:00:00.000-03:00",
-    "estado": "validado",
-    "genero": "masculino",
-    "financiador": [
-        {
-            "codigoPuco": 921001,
-            "nombre": "O.S.P. NEUQUEN",
-            "financiador": "O.S.P. NEUQUEN"
-        },
-        {
-            "codigoPuco": 921001,
-            "nombre": "O.S.P. NEUQUEN",
-            "financiador": "O.S.P. NEUQUEN"
-        }
-    ],
-    "relaciones": [
-        {
-            "_id": "5b92dec9646d99436065cbfc",
-            "relacion": {
-                "_id": "59247c391ebf0273353b23c0",
-                "nombre": "hijo/a",
-                "opuesto": "progenitor/a"
-            },
-            "referencia": "5b92de583173b053ae88f2d0",
-            "nombre": "JOSEFINA",
-            "apellido": "PERINGA PONCE",
-            "documento": "333333333",
-            "fotoId": "5f9072d00254f253d9c7dd54"
-        },
-        {
-            "_id": "5b92dec9646d99436065cbfa",
-            "relacion": {
-                "_id": "59247c391ebf0273353b23c0",
-                "nombre": "hijo/a",
-                "opuesto": "progenitor/a"
-            },
-            "referencia": "5b9287f10394a225c25a150b",
-            "nombre": "IGNACIO",
-            "apellido": "PERINGA PONCE",
-            "documento": "222222222",
-            "fotoId": "5f9072d00254f253d9c7dd2c"
-        },
-        {
-            "_id": "5f00d31e044ef317c36fd4f8",
-            "relacion": {
-                "_id": "59247c391ebf0273353b23c0",
-                "nombre": "hijo/a",
-                "opuesto": "progenitor/a"
-            },
-            "referencia": "5f00d2f7acfe3a7e46a88227",
-            "nombre": "JUAN CRUZ",
-            "apellido": "PERINGA  PONCE",
-            "documento": "11111111",
-            "fotoId": "5f9078ff0254f253d9dc7212"
-        },
-        {
-            "_id": "5f09f00d5cec191aa5908457",
-            "relacion": {
-                "_id": "59247e1c1ebf0273353b23c5",
-                "nombre": "otro",
-                "opuesto": "otro"
-            },
-            "referencia": "59cb176acd21ce293061b67b",
-            "nombre": "FLORENCIA INES",
-            "apellido": "YAMIL",
-            "documento": "15365478",
-            "fotoId": "5f9072b40254f253d9c79556"
-        }
-    ],
-    "direccion": [
-        {
-            "geoReferencia": [
-                -38.9305707,
-                -68.0839758
-            ],
-            "activo": true,
-            "_id": "58d90d6f0bb1a96b254d9878",
-            "valor": "Enrique Santos Discepolo 1856",
-            "codigoPostal": "8300",
-            "ubicacion": {
-                "_id": "58d90d6f0bb1a96b254d9879",
-                "pais": {
-                    "_id": "57f3b5c469fe79a598e6281f",
-                    "nombre": "Argentina"
-                },
-                "provincia": {
-                    "_id": "57f3f3aacebd681cc2014c53",
-                    "nombre": "Neuquén"
-                },
-                "localidad": {
-                    "_id": "57f538a472325875a199a82d",
-                    "nombre": "NEUQUEN"
-                },
-                "barrio": null
-            },
-            "ranking": 0,
-            "ultimaActualizacion": "2017-03-27T10:02:16.809-03:00"
-        },
-        {
-            "geoReferencia": null,
-            "activo": true,
-            "_id": "6046105ba4e2d85f81ad60f7",
-            "valor": "NORDENSTROM 1898 0 0",
-            "codigoPostal": "8300",
-            "ranking": 1,
-            "ubicacion": {
-                "_id": "6046105ba4e2d85f81ad60f8",
-                "pais": {
-                    "_id": "57f3b5c469fe79a598e6281f",
-                    "nombre": "Argentina"
-                },
-                "provincia": {
-                    "_id": "57f3f3aacebd681cc2014c53",
-                    "nombre": "Neuquén"
-                },
-                "localidad": {
-                    "_id": "57f538a472325875a199a82d",
-                    "nombre": "Neuquén"
-                },
-                "barrio": null
-            },
-            "ultimaActualizacion": "2021-03-08T08:54:04.089-03:00"
-        }
-    ],
-    "contacto": [
-        {
-            "activo": true,
-            "_id": "5cabf8cc129519c9cd5bf6f2",
-            "tipo": "celular",
-            "valor": "4462221"
-        },
-        {
-            "activo": true,
-            "_id": "5cabf8cc129519c9cd5bf6f1",
-            "tipo": "email",
-            "valor": "hugoperingaponce@gmail.com"
-        }
-    ],
-    "identificadores": [
-        {
-            "entidad": "RENAPER",
-            "valor": "241654536"
-        }
-    ],
-    "estadoCivil": "soltero",
-    "reportarError": false,
-    "scan": "27381849",
-    "carpetaEfectores": [
-        {
-            "_id": "5992e06a0e3f6446112e9bd5",
-            "organizacion": {
-                "_id": "59650203d03019f919ea31ed",
-                "nombre": "CENTRO DE SALUD PARQUE INDUSTRIAL"
-            },
-            "nroCarpeta": ""
-        },
-        {
-            "_id": "5b57565dc0202168d3d5762d",
-            "organizacion": {
-                "_id": "57e9670e52df311059bc8964",
-                "nombre": "HOSPITAL PROVINCIAL NEUQUEN - DR. EDUARDO CASTRO RENDON"
-            },
-            "nroCarpeta": "PDR27381849"
-        }
-    ],
-    "notas": [],
-    "cuil": "23273818499",
-    "foto": null,
-    "activo": true,
-    "notaError": "",
-    "tipoIdentificacion": null,
-    "numeroIdentificacion": null,
-    "fotoId": "6046105c18944f849e9fe315",
-    "documentos": [],
-    "fechaFallecimiento": null,
-    "createdBy": {
-        "organizacion": {
-            "id": "50580352367779",
-            "nombre": "LABORATORIO RAÑA - SERVICIOS MEDICOS"
-        }
-    }
-}

package/dist/helpers/patientFactory.d.ts

@@ -1,26 +0,0 @@
-import { AndesPatient } from '../types/andes/patient.types';
-export type PartialDeep<T> = {
-    [K in keyof T]?: T[K] extends object ? PartialDeep<T[K]> : T[K];
-};
-export declare const createPatient: (overrides?: PartialDeep<AndesPatient>) => {
-    _id?: string | undefined;
-    id?: string | undefined;
-    documento?: string | undefined;
-    cuil?: string | undefined;
-    tipoIdentificacion?: string | null | undefined;
-    numeroIdentificacion?: string | null | undefined;
-    nombre: string;
-    apellido: string;
-    fechaNacimiento?: string | Date | undefined;
-    fechaFallecimiento?: string | Date | null | undefined;
-    genero?: string | undefined;
-    sexo?: string | undefined;
-    estado?: string | null | undefined;
-    activo?: boolean | undefined;
-    estadoCivil?: string | null | undefined;
-    contacto?: import("../types/andes/patient.types").AndesContacto[] | undefined;
-    direccion?: import("../types/andes/patient.types").AndesDireccion[] | undefined;
-    relaciones?: import("../types/andes/patient.types").AndesRelacion[] | undefined;
-    foto?: string | null | undefined;
-    createdBy?: import("../types/andes/patient.types").AndesCreatedBy | undefined;
-};

package/dist/helpers/patientFactory.js

@@ -1,35 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPatient = void 0;
-const basePatient = __importStar(require("../data/patient.json"));
-const createPatient = (overrides = {}) => {
-    const clone = JSON.parse(JSON.stringify(basePatient));
-    return {
-        ...clone,
-        ...overrides,
-    };
-};
-exports.createPatient = createPatient;

package/dist/lib/config.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/lib/config.test.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("./config");
-beforeEach(() => {
-    (0, config_1.__reset)(); // Resetea el dominio antes de cada test
-});
-test('Get default domain', () => {
-    expect((0, config_1.getDominio)()).toBe('andes.gob.ar');
-});
-test('Get default URL without id', () => {
-    expect((0, config_1.makeUrl)('patient')).toBe('andes.gob.ar/patient');
-});
-test('Get default URL with id', () => {
-    expect((0, config_1.makeUrl)('patient', '123456')).toBe('andes.gob.ar/patient/123456');
-});
-test('Initialize domain modifies getDominio', () => {
-    (0, config_1.initialize)({ dominio: 'nuevo-dominio.com' });
-    expect((0, config_1.getDominio)()).toBe('nuevo-dominio.com');
-});

package/dist/lib/device.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/lib/device.test.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const device_1 = require("./device");
-test('Device type 1', () => {
-    expect((0, device_1.encode)().id).toBe('device-01');
-});
-test('Device Name', () => {
-    expect((0, device_1.encode)().deviceName[0].name).toBe('Sistema de Aplicaciones Neuquinas de Salud (ANDES)');
-});

package/dist/lib/patient.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/lib/patient.test.js

@@ -1,132 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const patient = __importStar(require("../data/patient.json"));
-const patient_1 = require("./patient");
-const patientFactory_1 = require("../helpers/patientFactory");
-const pacienteFhir = (0, patient_1.encode)(patient);
-describe('encode patient from ANDES to FHIR R4', () => {
-    test('Verify basic data', () => {
-        expect(pacienteFhir.resourceType).toBe('Patient');
-        const ident = pacienteFhir.identifier;
-        const id = ident?.find(t => t.system === 'http://www.renaper.gob.ar/dni');
-        expect(id?.value).toBe('42910660');
-        expect(id?.system).toBe('http://www.renaper.gob.ar/dni');
-        expect(pacienteFhir.active).toBe(true);
-        expect(pacienteFhir.name).toBeDefined();
-        expect(pacienteFhir.name[0].use).toBe('official');
-        expect(pacienteFhir.name[0].family).toContain('PERINGA');
-        expect(pacienteFhir.name[0].family).toContain('PONCE');
-        expect(pacienteFhir.name[0].given).toContain('AGUSTIN');
-        expect(pacienteFhir.name[0].text).toBe('HUGO AGUSTIN PERINGA PONCE');
-        expect(pacienteFhir.gender).toBe('male');
-        expect(pacienteFhir.birthDate).toBe('1979-11-14');
-    });
-    test('Verify patient with contact information', () => {
-        //  Phone;
-        expect(pacienteFhir.telecom).toBeDefined();
-        expect(pacienteFhir.telecom[0].value).toBe('4462221');
-        expect(pacienteFhir.telecom[0].system).toBe('phone');
-        //   Address;
-        expect(pacienteFhir.address).toBeDefined();
-        expect(pacienteFhir.address[0].postalCode).toBe('8300');
-        expect(pacienteFhir.address[0].line).toContain('Enrique Santos Discepolo 1856');
-        expect(pacienteFhir.address[0].city).toBe('NEUQUEN');
-        expect(pacienteFhir.address[0].state).toBe('Neuquén');
-        expect(pacienteFhir.address[0].country).toBe('Argentina');
-    });
-    test('Verify patient with relationships', () => {
-        // Validar que exista contact y al menos un elemento
-        expect(pacienteFhir.contact).toBeDefined();
-        expect(pacienteFhir.contact.length).toBeGreaterThan(0);
-        const contacto0 = pacienteFhir.contact[0];
-        // Validar que tenga relationship y name estructurados
-        expect(contacto0.relationship).toBeDefined();
-        expect(contacto0.relationship.length).toBeGreaterThan(0);
-        expect(contacto0.name).toBeDefined();
-        // Ahora sí: acceder sin que TS marque error
-        expect(contacto0.relationship[0].text).toBe('hijo/a');
-        expect(contacto0.name.family).toContain('PERINGA');
-        expect(contacto0.name.given).toContain('JOSEFINA');
-    });
-    test('Maneja paciente con estado validado', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ estado: 'validado' });
-        const fhir = (0, patient_1.encode)(paciente);
-        expect(fhir).not.toBeNull();
-        expect(fhir.extension?.some(t => t.valueCode === 'validado')).toBeTruthy();
-    });
-    test('Maneja paciente con estado temporal', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ estado: 'temporal' });
-        const fhir = (0, patient_1.encode)(paciente);
-        expect(fhir).not.toBeNull();
-        expect(fhir.extension?.some(t => t.valueCode === 'temporal')).toBeTruthy();
-    });
-    test('Maneja paciente con estado nulo', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ estado: null });
-        const fhir = (0, patient_1.encode)(paciente);
-        expect(fhir).not.toBeNull();
-        expect(fhir.extension?.some(t => t.valueCode === 'temporal')).toBeTruthy();
-    });
-    it('Verifica organización que crea paciente', () => {
-        const fhir = pacienteFhir;
-        expect(fhir.managingOrganization).toBeDefined();
-        expect(fhir.managingOrganization.display).toContain('LABORATORIO');
-    });
-    it('Verifica dni extranjero', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ tipoIdentificacion: 'dni extranjero', numeroIdentificacion: 'ABC123' });
-        const fhir = (0, patient_1.encode)(paciente);
-        expect(fhir).not.toBeNull();
-        const id = fhir.identifier?.find(t => t.system === 'andes.gob.ar/sid/foreign-id');
-        expect(id?.value).toBe('ABC123');
-        expect(id?.system).toBe('andes.gob.ar/sid/foreign-id');
-    });
-    it('Verifica pasaporte', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ tipoIdentificacion: 'pasaporte', numeroIdentificacion: 'ABC123CD' });
-        const fhir = (0, patient_1.encode)(paciente);
-        expect(fhir).not.toBeNull();
-        const id = fhir.identifier?.find(t => t.system === 'andes.gob.ar/sid/passport');
-        expect(id?.value).toBe('ABC123CD');
-        expect(id?.system).toBe('andes.gob.ar/sid/passport');
-    });
-});
-describe('decode patient from FHIR R4 to ANDES', () => {
-    it('Verifica dni extranjero', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ tipoIdentificacion: 'dni extranjero', numeroIdentificacion: 'ABC123' });
-        const fhirEncode = (0, patient_1.encode)(paciente);
-        expect(fhirEncode).not.toBeNull();
-        const fhirDecode = (0, patient_1.decode)(fhirEncode);
-        expect(fhirDecode?.tipoIdentificacion).toBe('dni extranjero');
-        expect(fhirDecode?.numeroIdentificacion).toBe('ABC123');
-    });
-    it('Verifica pasaporte', () => {
-        const paciente = (0, patientFactory_1.createPatient)({ tipoIdentificacion: 'pasaporte', numeroIdentificacion: 'ABC123CD' });
-        const fhirEncode = (0, patient_1.encode)(paciente);
-        expect(fhirEncode).not.toBeNull();
-        const fhirDecode = (0, patient_1.decode)(fhirEncode);
-        expect(fhirDecode?.tipoIdentificacion).toBe('pasaporte');
-        expect(fhirDecode?.numeroIdentificacion).toBe('ABC123CD');
-        expect(fhirDecode?.estado).toBe('temporal');
-    });
-});