@icure/be-fhc-api 0.6.6 → 0.6.7

package/model/InvoiceItem.d.ts

@@ -39,6 +39,9 @@ export declare class InvoiceItem {
     timeOfDay?: InvoiceItem.TimeOfDayEnum;
     transplantationCode?: InvoiceItem.TransplantationCodeEnum;
     units?: number;
+    options?: {
+        [key: string]: string;
+    };
 }
 export declare namespace InvoiceItem {
     type DerogationMaxNumberEnum = "Other" | "DerogationMaxNumber" | "OtherPrescription" | "SecondPrestationOfDay" | "ThirdAndNextPrestationOfDay";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icure/be-fhc-api",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Typescript version of Freehealth Connector standalone API client",
   "main": "index.js",
   "types": "index.d.ts",

package/x-api/message-x-api.js

@@ -585,6 +585,14 @@ class MessageXApi {
                             });
                         }
                     }
+                    if (r.et25 && r.et25.errorDetail) {
+                        let refEt25 = r.et25.invoiceReference.trim();
+                        errors.push({
+                            itemId: (0, efact_util_1.decodeBase36Uuid)(refEt25),
+                            error: r.et25.errorDetail,
+                            record: "ET25"
+                        });
+                    }
                     _.each(r.items, i => {
                         let ref = (i.et50 && i.et50.itemReference.trim()) || refEt20; //fallback
                         if (i.et50 && i.et50.errorDetail) {
@@ -809,7 +817,11 @@ class MessageXApi {
         return (0, efact_util_1.getFederaton)(invoices, this.insuranceApi).then(fed => {
             return (prefixer
                 ? prefixer(fed, hcp.id)
-                : Promise.resolve(`efact:${hcp.id}:${year}:${fed.code === "306" ? "300" : fed.code === "675" ? "600" : fed.code}:`)).then(prefix => {
+                : Promise.resolve(`efact:${hcp.id}:${year}:${fed.code === "306"
+                    ? "300"
+                    : fed.code === "675" || fed.code === "690"
+                        ? "600"
+                        : fed.code}:`)).then(prefix => {
                 return this.entityReferenceApi
                     .getLatest(prefix)
                     .then((er) => er && er.id && er.id.startsWith(prefix)

package/x-api/utils/efact-parser.d.ts

@@ -67,6 +67,25 @@ export interface ET20Data extends ETData {
     insurabilityStartDate: string;
     insurabilityEndDate: string;
 }
+export interface ET25Data extends ETData {
+    recordOrderNumber: string;
+    mutualityCode: string;
+    ssin: string;
+    sexe: string;
+    urgencyMedicalAssistance: string;
+    nihii: string;
+    establishmentStayNumber: string;
+    mutualityDestination: string;
+    codeCover: string;
+    invoiceNumber: string;
+    invoiceReference: string;
+    identityFlag: string;
+    cbePcsa: string;
+    refElectronicAMU: string;
+    cardNumber: string;
+    versionNumber: string;
+    recordControlNumber: string;
+}
 export interface ET50Data extends ETData {
     recordOrderNumber: string;
     sex: string;
@@ -149,6 +168,7 @@ export interface ET92Data {
 }
 export interface ET20_80Data {
     et20: ET20Data;
+    et25?: ET25Data;
     items: Array<{
         et50?: ET50Data | undefined;
         et51?: ET51Data | undefined;
@@ -202,6 +222,7 @@ export declare abstract class EfactMessageReader {
     readZone300Short(zone300: Record): Zone300Short;
     readET10(et10: Record): ET10Data;
     readET20(et20: Record): ET20Data;
+    readET25(et25: Record): ET25Data;
     readET50(et50: Record): ET50Data;
     readET51(et51: Record): ET51Data;
     readET52(et52: Record): ET52Data;

package/x-api/utils/efact-parser.js

@@ -291,6 +291,55 @@ class EfactMessageReader {
             insurabilityEndDate
         };
     }
+    readET25(et25) {
+        const etNumber = 25;
+        let i = 0;
+        if (et25.zones[i].value !== etNumber.toString()) {
+            throw new Error(`Trying to parse an ET${etNumber} that is not an ET${etNumber} --- ${JSON.stringify(et25)}`);
+        }
+        i++;
+        this.log("EnregistrementDeType25", et25.zones[i].value);
+        const recordOrderNumber = this.log("NumOrdreEnregistrement", et25.zones[i++].value);
+        const mutualityCode = this.log("NumMutuelleAffiliation", et25.zones[i++].value);
+        const ssin = this.log("NumIdentificationMediprima", et25.zones[i++].value);
+        const sexe = this.log("CodeSexeBeneficiaire", et25.zones[i++].value);
+        const urgencyMedicalAssistance = this.log("CodeAideMedicaleUrgente", et25.zones[i++].value);
+        const nihii = this.log("NumEtablissementQuiFacture", et25.zones[i++].value);
+        const establishmentStayNumber = this.log("NumEtablissementDeSejour", et25.zones[i++].value);
+        const mutualityDestination = this.log("NumMutualiteDestination", et25.zones[i++].value);
+        const invoiceNumber = this.log("NumFactureIndividuelle", et25.zones[i++].value);
+        const codeCover = this.log("CodeCouverture", et25.zones[i++].value);
+        const invoiceReference = this.log("ReferenceDeLetablissement", et25.zones[i++].value);
+        const identityFlag = this.log("FlagIdentificationDuBeneficiaire", et25.zones[i++].value);
+        const cbePcsa = this.log("NumBceCpas", et25.zones[i++].value);
+        const refElectronicAMU = this.log("ReferenceAMUElectronique", et25.zones[i++].value);
+        const cardNumber = this.log("NumeroCarte", et25.zones[i++].value);
+        const versionNumber = this.log("NumVersionCarte", et25.zones[i++].value);
+        const recordControlNumber = this.log("ChiffreDeControle", et25.zones[i++].value);
+        if (i !== et25.zones.length) {
+            throw new Error(`You didn\'t parse every zones of the ET${etNumber}`);
+        }
+        return {
+            errorDetail: et25.errorDetail,
+            recordOrderNumber: recordOrderNumber,
+            mutualityCode: mutualityCode,
+            ssin: ssin,
+            sexe: sexe,
+            urgencyMedicalAssistance: urgencyMedicalAssistance,
+            nihii: nihii,
+            establishmentStayNumber: establishmentStayNumber,
+            codeCover: codeCover,
+            invoiceReference: invoiceReference,
+            identityFlag: identityFlag,
+            cbePcsa: cbePcsa,
+            refElectronicAMU: refElectronicAMU,
+            cardNumber: cardNumber,
+            versionNumber: versionNumber,
+            recordControlNumber: recordControlNumber,
+            mutualityDestination: mutualityDestination,
+            invoiceNumber: invoiceNumber
+        };
+    }
     readET50(et50) {
         const etNumber = 50;
         let i = 0;
@@ -867,6 +916,10 @@ class EfactMessage920900Reader extends EfactMessageReader {
             while (rawRecords[i].zones[0].value === "20") {
                 const et20 = this.readET20(rawRecords[i]);
                 i++;
+                if (rawRecords[i].zones[0].value === "25") {
+                    const et25 = this.readET25(rawRecords[i]);
+                    i++;
+                }
                 const items = [];
                 while (rawRecords[i].zones[0].value === "50" ||
                     rawRecords[i].zones[0].value === "51" ||
@@ -961,6 +1014,10 @@ class EfactMessage920099Reader extends EfactMessageReader {
             while (rawRecords[i].zones[0].value === "20") {
                 const et20 = this.readET20(rawRecords[i]);
                 i++;
+                if (rawRecords[i].zones[0].value === "25") {
+                    const et25 = this.readET25(rawRecords[i]);
+                    i++;
+                }
                 const items = [];
                 while (rawRecords[i].zones[0].value === "50" ||
                     rawRecords[i].zones[0].value === "51" ||
@@ -1033,6 +1090,10 @@ class EfactMessage920098Reader extends EfactMessageReader {
             while (rawRecords[i].zones[0].value === "20") {
                 const et20 = this.readET20(rawRecords[i]);
                 i++;
+                if (rawRecords[i].zones[0].value === "25") {
+                    const et25 = this.readET25(rawRecords[i]);
+                    i++;
+                }
                 const items = [];
                 while (rawRecords[i].zones[0].value === "50" ||
                     rawRecords[i].zones[0].value === "51" ||

package/x-api/utils/efact-util.js

@@ -19,8 +19,10 @@ const moment = require("moment");
 const uuid_encoder_1 = require("./uuid-encoder");
 const base36UUID = new uuid_encoder_1.UuidEncoder();
 function ensureNoFederation(invoices, insurances) {
-    // We will check here for recipient which are federations (except 306).
-    const federations = insurances.filter(i => i.code !== "306" && i.code !== "675" && i.id === i.parent);
+    // We will check here for recipient which are federations (except 306, 675, 690).
+    // 675 => Mutuality for marines
+    // 690 => Mutuality for Public Centres for Social Welfare
+    const federations = insurances.filter(i => i.code !== "306" && i.code !== "675" && i.code !== "690" && i.id === i.parent);
     if (federations.length > 0) {
         console.error(`Invoices directed to ${federations.map(i => i.code).join()}, invoices ${invoices.map(i => i.invoice.id)}`);
         throw "Some invoices are directly destinated to federations inside of mutuality office !";
@@ -251,6 +253,7 @@ function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode,
     invoiceItem.units = invoicingCode.units || 1;
     invoiceItem.derogationMaxNumber = getDerogationMaxNumber(invoicingCode.derogationMaxNumber || 0);
     invoiceItem.internshipNihii = invoice.internshipNihii;
+    invoiceItem.options = invoice.options;
     return invoiceItem;
 }
 function getPercentNorm(norm) {