@icure/be-fhc-api 0.4.17 → 0.4.19

package/package.json

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

package/x-api/message-x-api.d.ts

@@ -30,7 +30,7 @@ export declare class MessageXApi {
         message: Message;
         invoices: Array<Invoice>;
     }>;
-    sendBatch(user: User, hcp: HealthcareParty, invoices: Array<InvoiceWithPatient>, xFHCKeystoreId: string, xFHCTokenId: string, xFHCPassPhrase: string, efactApi: fhcEfactApi, fhcServer?: string | undefined, prefixer?: (fed: Insurance, hcpId: string) => Promise<string>, isConnectedAsPmg?: boolean, medicalLocationId?: string | null): Promise<Message>;
+    sendBatch(user: User, hcp: HealthcareParty, invoices: Array<InvoiceWithPatient>, xFHCKeystoreId: string, xFHCTokenId: string, xFHCPassPhrase: string, efactApi: fhcEfactApi, fhcServer?: string | undefined, prefixer?: (fed: Insurance, hcpId: string) => Promise<string>, isConnectedAsPmg?: boolean, medicalLocationId?: string | null, speciality?: string): Promise<Message>;
     saveMessageAttachment(user: User, msg: Message, res: EfactSendResponseWithError): Promise<Receipt>;
 }
 export {};

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

@@ -339,10 +339,11 @@ class MessageXApi {
     }
     isBlockingError(errorDetail, oa) {
         //check : https://medispring.atlassian.net/browse/MS-7967
+        //check : https://medispring.atlassian.net/browse/MS-8650
         const lineNumbersToVerify = ["1", "2", "3"];
         const nonBlockingErrorLetters = ["E"];
         const nonBlockingErrorCodesByOa = {
-            "100": [],
+            "100": ["502744"],
             "200": [],
             "300": [],
             "306": [],
@@ -697,7 +698,7 @@ class MessageXApi {
             }));
         });
     }
-    sendBatch(user, hcp, invoices, xFHCKeystoreId, xFHCTokenId, xFHCPassPhrase, efactApi, fhcServer = undefined, prefixer, isConnectedAsPmg = false, medicalLocationId = null) {
+    sendBatch(user, hcp, invoices, xFHCKeystoreId, xFHCTokenId, xFHCPassPhrase, efactApi, fhcServer = undefined, prefixer, isConnectedAsPmg = false, medicalLocationId = null, speciality = "doctor") {
         const uuid = this.crypto.randomUuid();
         const smallBase36 = (0, efact_util_1.uuidBase36Half)(uuid);
         const fullBase36 = (0, efact_util_1.uuidBase36)(uuid);
@@ -719,7 +720,7 @@ class MessageXApi {
                         docId: uuid
                     }));
                 })
-                    .then(er => (0, efact_util_1.toInvoiceBatch)(invoices, hcp, fullBase36, er && er.id ? Number(er.id.substr(prefix.length)) % 1000 : 0, smallBase36, this.insuranceApi, this.invoiceXApi, this.api, medicalLocationId === "medicalhouse"))
+                    .then(er => (0, efact_util_1.toInvoiceBatch)(invoices, hcp, fullBase36, er && er.id ? Number(er.id.substr(prefix.length)) % 1000 : 0, smallBase36, this.insuranceApi, this.invoiceXApi, this.api, speciality))
                     .then(batch => efactApi
                     .sendBatchUsingPOST(xFHCKeystoreId, xFHCTokenId, xFHCPassPhrase, batch)
                     //.then(() => { throw "ERREUR FORCEE" })

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

@@ -16,7 +16,7 @@ export interface InvoiceWithPatient {
 }
 export declare function getFederaton(invoices: Array<InvoiceWithPatient>, insuranceApi: IccInsuranceApi): Promise<Insurance>;
 export declare function getRelatedInvoicesInfo(invoicesWithPatient: InvoiceWithPatient[], insuranceApi: IccInsuranceApi, invoiceXApi: IccInvoiceXApi, messageXApi: IccMessageXApi): Promise<RelatedInvoiceInfo[]>;
-export declare function toInvoiceBatch(invoicesWithPatient: Array<InvoiceWithPatient>, hcp: HealthcareParty, batchRef: string, batchNumber: number, fileRef: string, insuranceApi: IccInsuranceApi, invoiceXApi: IccInvoiceXApi, messageXApi: IccMessageXApi, flatrateInvoice?: boolean): Promise<InvoicesBatch>;
+export declare function toInvoiceBatch(invoicesWithPatient: Array<InvoiceWithPatient>, hcp: HealthcareParty, batchRef: string, batchNumber: number, fileRef: string, insuranceApi: IccInsuranceApi, invoiceXApi: IccInvoiceXApi, messageXApi: IccMessageXApi, speciality: string): Promise<InvoicesBatch>;
 export declare function getDerogationMaxNumber(code: number): InvoiceItem.DerogationMaxNumberEnum;
 export declare function toDerogationMaxNumber(derogation: InvoiceItem.DerogationMaxNumberEnum): number;
 export declare function uuidBase36(uuid: string): string;

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

@@ -91,7 +91,7 @@ function getRelatedInvoicesInfo(invoicesWithPatient, insuranceApi, invoiceXApi,
 }
 exports.getRelatedInvoicesInfo = getRelatedInvoicesInfo;
 // Here we trust the invoices argument for grouping validity (month, year and patient)
-function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef, insuranceApi, invoiceXApi, messageXApi, flatrateInvoice = false) {
+function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef, insuranceApi, invoiceXApi, messageXApi, speciality) {
     return insuranceApi
         .getInsurances(new api_1.ListOfIds({
         ids: _.compact(invoicesWithPatient.map(iwp => iwp.invoice.recipientId))
@@ -112,10 +112,8 @@ function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef
                 const invoicesBatch = new models_1.InvoicesBatch({});
                 invoicesBatch.batchRef = batchRef;
                 invoicesBatch.fileRef = fileRef;
-                invoicesBatch.magneticInvoice = flatrateInvoice; //flatrateInvoice have some different fields
-                if (flatrateInvoice) {
-                    invoicesBatch.invoiceContent = 0;
-                }
+                invoicesBatch.magneticInvoice = speciality === "medicalhouse"; //flatrateInvoice have some different fields
+                speciality === "medicalhouse" ? invoicesBatch.invoiceContent = 0 : speciality === "midwife" ? invoicesBatch.invoiceContent = 50 : null;
                 invoicesBatch.invoices = _.map(invoicesWithPatient, (invWithPat) => {
                     const invoice = invWithPat.aggregatedInvoice || invWithPat.invoice;
                     const relatedInvoiceInfo = _.find(relatedInvoicesInfo, rivi => rivi.invoiceId === invoice.id);
@@ -123,7 +121,7 @@ function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef
                     if (!insurance) {
                         throw "Insurance is invalid for patient " + invWithPat.patient.id;
                     }
-                    return toInvoice(hcp.nihii, invoice, invWithPat.patient, insurance, relatedInvoiceInfo, flatrateInvoice);
+                    return toInvoice(hcp.nihii, invoice, invWithPat.patient, insurance, relatedInvoiceInfo, speciality);
                 });
                 const now = new Date();
                 const invoiceDates = _.groupBy(invoicesWithPatient.map(inv => { var _a, _b; return ((_b = (_a = inv === null || inv === void 0 ? void 0 : inv.invoice) === null || _a === void 0 ? void 0 : _a.invoiceDate) !== null && _b !== void 0 ? _b : 100001).toString().substring(0, 6) + "01"; }));
@@ -163,7 +161,7 @@ function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef
     });
 }
 exports.toInvoiceBatch = toInvoiceBatch;
-function toInvoice(nihiiHealthcareProvider, invoice, patient, insurance, relatedInvoiceInfo, flatrateInvoice = false) {
+function toInvoice(nihiiHealthcareProvider, invoice, patient, insurance, relatedInvoiceInfo, speciality) {
     const efactInvoice = new models_1.Invoice({});
     const invoiceYear = moment(invoice.created)
         .year()
@@ -175,7 +173,7 @@ function toInvoice(nihiiHealthcareProvider, invoice, patient, insurance, related
     efactInvoice.invoiceRef = uuidBase36(invoice.id);
     efactInvoice.ioCode = insurance.code.substr(0, 3);
     efactInvoice.items = _.map(invoice.invoicingCodes, (invoicingCode) => {
-        return toInvoiceItem(invoice.supervisorNihii || nihiiHealthcareProvider, patient, invoice, invoicingCode, flatrateInvoice);
+        return toInvoiceItem(invoice.supervisorNihii || nihiiHealthcareProvider, patient, invoice, invoicingCode, speciality);
     });
     efactInvoice.patient = (0, fhc_patient_util_1.toPatient)(patient);
     efactInvoice.ignorePrescriptionDate = !!invoice.longDelayJustification;
@@ -189,7 +187,7 @@ function toInvoice(nihiiHealthcareProvider, invoice, patient, insurance, related
     // TODO : fix me later
     efactInvoice.reason = models_1.Invoice.ReasonEnum.Other;
     efactInvoice.creditNote = invoice.creditNote;
-    if (flatrateInvoice) {
+    if (speciality === "medicalhouse") {
         efactInvoice.startOfCoveragePeriod = invoice.invoicingCodes[0].contractDate;
     }
     if (invoice === null || invoice === void 0 ? void 0 : invoice.locationNihii) {
@@ -199,12 +197,12 @@ function toInvoice(nihiiHealthcareProvider, invoice, patient, insurance, related
     }
     return efactInvoice;
 }
-function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode, flatrateInvoice = false) {
+function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode, speciality) {
     const invoiceItem = new models_1.InvoiceItem({});
     invoiceItem.codeNomenclature = Number(invoicingCode.tarificationId.split("|")[1]);
     invoiceItem.dateCode = (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode).toDate());
     // Only applies to flatrate invoicing (https://medispring.atlassian.net/wiki/spaces/EN/pages/2536013825/Behavior+of+diabetes+pre-care+pathways+flatrate+invoicing)
-    if (flatrateInvoice) {
+    if (speciality === "medicalhouse") {
         invoiceItem.endDateCode =
             invoiceItem.codeNomenclature === 109594 // Diabetes pre-care pathways
                 ? (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode).toDate())