@icure/be-fhc-api 0.4.10 → 0.4.13

package/api/fhcDataAttributeServiceApi.js

@@ -51,8 +51,10 @@ class fhcDataAttributeserviceApi {
             (from ? "&from=" + encodeURIComponent(String(from)) : "") +
             (to ? "&to=" + encodeURIComponent(String(to)) : "") +
             (cause ? "&cause=" + encodeURIComponent(String(cause)) : "") +
-            (prolongation ? "&prolongation=" + encodeURIComponent(String(prolongation)) : "") +
-            (total ? "&total=" + encodeURIComponent(String(total)) : "");
+            (prolongation !== undefined
+                ? "&prolongation=" + encodeURIComponent(String(prolongation))
+                : "") +
+            (total !== undefined ? "&total=" + encodeURIComponent(String(total)) : "");
         let headers = this.headers;
         xFHCKeystoreId && (headers = headers.concat(new XHR_1.XHR.Header("X-FHC-keystoreId", xFHCKeystoreId)));
         xFHCTokenId && (headers = headers.concat(new XHR_1.XHR.Header("X-FHC-tokenId", xFHCTokenId)));

package/package.json

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

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

@@ -352,6 +352,7 @@ class MessageXApi {
             const parentMessage = msgsForHcp[0];
             return this.receiptXApi.iccApi
                 .createReceipt(new api_1.Receipt({
+                id: this.crypto.randomUuid(),
                 documentId: parentMessage.id,
                 references: [
                     `mycarenet:efact:inputReference:${ref}`,

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

@@ -126,9 +126,21 @@ function toInvoiceBatch(invoicesWithPatient, hcp, batchRef, batchNumber, fileRef
                     return toInvoice(hcp.nihii, invoice, invWithPat.patient, insurance, relatedInvoiceInfo, flatrateInvoice);
                 });
                 const now = new Date();
-                const invoiceDate = (0, formatting_util_1.toMoment)(invoicesWithPatient[0].invoice.invoiceDate);
-                const invoicingMonth = invoiceDate.month() + 1;
-                const invoicingYear = invoiceDate.year();
+                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"; }));
+                //The invoiceMonth/Year of the batch must be equal to the most recent month/year of the invoices that has the highest count within the batch.
+                //From the INAMI Rules: (https://www.riziv.fgov.be/SiteCollectionDocuments/instructions_facturation_electronique_2021.pdf page 213)
+                // In deze zone bedoelt men de maand waarin het merendeel der prestaties, die op deze factuur staan,
+                // werden verricht. Deze maand kan verschillend zijn van de maand waarin de factuur werd opgemaakt
+                //Examples:
+                //A. 10 invoices 02/2020, 10 invoices 03/2020, 5 invoices 04/2020 --> 03/2020
+                //B. 10 invoices 02/2020;  9 invoices 03/2020, 5 invoices 04/2020 --> 02/2020
+                let dateCounts = [];
+                _.forOwn(invoiceDates, function (val, key) {
+                    dateCounts.push({ date: key, count: val.length });
+                });
+                const invoiceDate = (0, formatting_util_1.toMoment)(_.get(_.head(_.orderBy(dateCounts, ["count", "date"], ["desc", "desc"])), "date", invoicesWithPatient[0].invoice.invoiceDate));
+                const invoicingMonth = !!invoiceDate ? invoiceDate.month() + 1 : 0;
+                const invoicingYear = !!invoiceDate ? invoiceDate.year() : 0;
                 // The OA 500, matches the monthYear (zone 300) to check the batch sending number
                 // Use sending year to prevent duplicate sending number in case of invoices made
                 // on the previous year
@@ -186,12 +198,13 @@ function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode,
     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());
-    invoiceItem.endDateCode =
-        invoiceItem.codeNomenclature === 109594
-            ? (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode).toDate())
-            : (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode)
-                .endOf("month")
-                .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) {
+        invoiceItem.endDateCode =
+            invoiceItem.codeNomenclature === 109594 // Diabetes pre-care pathways
+                ? (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode).toDate())
+                : (0, formatting_util_1.dateEncode)((0, formatting_util_1.toMoment)(invoicingCode.dateCode).endOf("month").toDate());
+    }
     invoiceItem.doctorIdentificationNumber = nihiiHealthcareProvider;
     invoiceItem.doctorSupplement = Number(((invoicingCode.doctorSupplement || 0) * 100).toFixed(0));
     if (invoicingCode.eidReadingHour && invoicingCode.eidReadingValue) {
@@ -209,10 +222,11 @@ function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode,
     invoiceItem.invoiceRef = uuidBase36(invoicingCode.id);
     invoiceItem.override3rdPayerCode = invoicingCode.override3rdPayerCode;
     invoiceItem.patientFee = Number(((invoicingCode.patientIntervention || 0) * 100).toFixed(0));
-    invoiceItem.percentNorm = models_1.InvoiceItem.PercentNormEnum.None;
+    invoiceItem.percentNorm = getPercentNorm(invoicingCode.percentNorm || 0);
     invoiceItem.personalInterventionCoveredByThirdPartyCode =
         invoicingCode.cancelPatientInterventionReason;
     invoiceItem.prescriberNihii = invoicingCode.prescriberNihii;
+    invoiceItem.prescriptionDate = invoicingCode.prescriptionDate;
     invoiceItem.prescriberNorm = getPrescriberNorm(invoicingCode.prescriberNorm || 0);
     invoiceItem.reimbursedAmount = Number(((invoicingCode.reimbursement || 0) * 100).toFixed(0));
     invoiceItem.relatedCode = Number(invoicingCode.relatedCode || 0);
@@ -223,6 +237,25 @@ function toInvoiceItem(nihiiHealthcareProvider, patient, invoice, invoicingCode,
     invoiceItem.internshipNihii = invoice.internshipNihii;
     return invoiceItem;
 }
+function getPercentNorm(norm) {
+    return norm === 0
+        ? models_1.InvoiceItem.PercentNormEnum.None
+        : norm === 1
+            ? models_1.InvoiceItem.PercentNormEnum.SurgicalAid1
+            : norm === 2
+                ? models_1.InvoiceItem.PercentNormEnum.SurgicalAid2
+                : norm === 3
+                    ? models_1.InvoiceItem.PercentNormEnum.ReducedFee
+                    : norm === 4
+                        ? models_1.InvoiceItem.PercentNormEnum.Ah1n1
+                        : norm === 5
+                            ? models_1.InvoiceItem.PercentNormEnum.HalfPriceSecondAct
+                            : norm === 6
+                                ? models_1.InvoiceItem.PercentNormEnum.InvoiceException
+                                : norm === 7
+                                    ? models_1.InvoiceItem.PercentNormEnum.ForInformation
+                                    : models_1.InvoiceItem.PercentNormEnum.None;
+}
 function getSideCode(code) {
     return code === 0
         ? models_1.InvoiceItem.SideCodeEnum.None