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

package/dist/lib/organization.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encode = void 0;
 const config_1 = require("./config");
+const rankingMapping_1 = require("../utils/rankingMapping");
 /**
  * Encode an ANDES Organization to FHIR Organization
  */
@@ -13,25 +14,25 @@ function encode(organization) {
     const identificadores = [];
     if (data.codigo?.sisa) {
         identificadores.push({
-            system: 'andes.gob.ar/sisa',
+            system: 'https://andes.gob.ar/sisa',
             value: data.codigo.sisa
         });
     }
     if (data.codigo?.cuie) {
         identificadores.push({
-            system: 'andes.gob.ar/cuie',
+            system: 'https://andes.gob.ar/cuie',
             value: data.codigo.cuie
         });
     }
     if (data.codigo?.remediar) {
         identificadores.push({
-            system: 'andes.gob.ar/remediar',
+            system: 'https://andes.gob.ar/remediar',
             value: data.codigo.remediar
         });
     }
     if (data.codigo?.sips) {
         identificadores.push({
-            system: 'andes.gob.ar/sips',
+            system: 'https://andes.gob.ar/sips',
             value: data.codigo.sips
         });
     }
@@ -44,7 +45,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':

package/dist/lib/patient.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verify = exports.decode = exports.encode = void 0;
 const config_1 = require("./config");
+const rankingMapping_1 = require("../utils/rankingMapping");
 /**
  * Helpers
  */
@@ -99,16 +100,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
  */
@@ -155,7 +146,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':
@@ -309,7 +300,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':

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

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encode = void 0;
 const config_1 = require("./config");
-/**
- * Encode a practitioner from ANDES to FHIR
- */
+const fhirDate_1 = require("../utils/fhirDate");
 function encode(practitioner) {
     const data = practitioner;
     if (!data) {
@@ -86,15 +84,22 @@ function encode(practitioner) {
             unaMatricula.code = {
                 coding: [{
                         system: 'http://www.saludneuquen.gob.ar/fiscalizacion.html',
-                        code: datosGrado.profesion.codigo,
+                        code: String(datosGrado.profesion.codigo ?? ''),
                         display: 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;
     });
@@ -118,15 +123,22 @@ function encode(practitioner) {
             unaMatricula.code = {
                 coding: [{
                         system: 'http://www.saludneuquen.gob.ar/fiscalizacion.html',
-                        code: datosPosgrado.especialidad.codigo,
+                        code: String(datosPosgrado.especialidad.codigo ?? ''),
                         display: datosPosgrado.especialidad.tipo
                     }],
-                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;
     });
@@ -162,7 +174,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;

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

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,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapFhirRankToAndesRanking = exports.mapAndesRankingToFhirRank = void 0;
+/**
+ * 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;
+}
+exports.mapAndesRankingToFhirRank = mapAndesRankingToFhirRank;
+/**
+ * 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;
+}
+exports.mapFhirRankToAndesRanking = mapFhirRankToAndesRanking;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andes/fhir",
-    "version": "1.12.1-beta.7",
+    "version": "1.13.0-beta.2",
     "engines": {
         "node": ">=18.0.0"
     },