fhir-dosage-utils 1.1.0 → 1.1.1

package/dist/locales/de/common.json

@@ -3,23 +3,39 @@
     "and": "und",
     "then": "dann"
   },
+  "amount": {
+    "range": {
+      "withUnit": {
+        "lowAndHigh": "zwischen {{low}} und {{high}} {{unit}}",
+        "onlyHigh": "bis {{high}} {{unit}}",
+        "onlyLow": "mindestens {{low}} {{unit}}"
+      },
+      "withoutUnit": {
+        "lowAndHigh": "zwischen {{low}} und {{high}}",
+        "onlyHigh": "bis {{high}}",
+        "onlyLow": "mindestens {{low}}"
+      }
+    },
+    "ratio": {
+      "withUnit": {
+        "numerator": "{{count}} {{numeratorUnit}}",
+        "denominator_one": "pro {{denominatorUnit}}",
+        "denominator_other": "jeder {{count}} {{denominatorUnit}}"
+      },
+      "withoutUnit": {
+        "numerator": "{{count}}",
+        "denominator_one": ":{{count}}",
+        "denominator_other": ":{{count}}"
+      }
+    },
+    "quantity": "{{quantity}} {{unit}}"
+  },
   "fields": {
     "doseQuantity": "{{quantity}} {{unit}}",
-    "doseRange": {
-      "lowAndHigh": "zwischen {{low}} und {{high}} {{unit}}",
-      "onlyHigh": "bis {{high}} {{unit}}",
-      "onlyLow": "{{low}} {{unit}}"
-    },
+    "doseRange": "{{rangeText}}",
     "rateQuantity": "mit einem Verhältnis von {{quantity}} {{unit}}",
-    "rateRange": {
-      "lowAndHigh": "mit einem Verhältnis zwischen {{low}} und {{high}} {{unit}}",
-      "onlyHigh": "mit einem Verhältnis von {{high}} {{unit}}",
-      "onlyLow": "mit einem Verhältnis von {{low}} {{unit}}"
-    },
-    "rateRatio": {
-      "rateRatio_one": "mit einem Verhältnis von {{quantityNumerator}} {{numeratorUnit}} pro {{denominatorUnit}}",
-      "rateRatio_other": "mit einem Verhältnis von {{quantityNumerator}} {{numeratorUnit}} jeder {{count}} {{denominatorUnit}}"
-    },
+    "rateRange": "mit einem Verhältnis von {{rangeText}}",
+    "rateRatio": "mit einem Verhältnis von {{ratioText}}",
     "duration": "für {{durationText}}",
     "durationMax": "(maximal {{durationMaxText}})",
     "frequency": {
@@ -54,11 +70,7 @@
       "onlyStart": "ab {{start}}",
       "onlyEnd": "bis {{end}}"
     },
-    "boundsRange": {
-      "lowAndHigh": "für {{low}} bis {{high}} {{unit}}",
-      "onlyHigh": "bis {{high}} {{unit}}",
-      "onlyLow": "für mindestens {{low}} {{unit}}"
-    },
+    "boundsRange": "für {{rangeText}}",
     "count": {
       "count_one": "{{count}} Mal nehmen",
       "count_other": "{{count}} Mal nehmen"
@@ -73,10 +85,6 @@
     },
     "maxDosePerLifetime": "bis zu einer maximalen Menge von {{count}} {{unit}} über die Lebenszeit des Patienten",
     "maxDosePerAdministration": "bis zu einer maximalen Menge von {{count}} {{unit}} pro Dosis",
-    "maxDosePerPeriod": {
-      "general": "bis zu einer maximalen Menge von {{maxDosePerPeriodText}}",
-      "maxDosePerPeriod_one": "{{quantityNumerator}} {{numeratorUnit}} pro {{denominatorUnit}}",
-      "maxDosePerPeriod_other": "{{quantityNumerator}} {{numeratorUnit}} jeder {{count}} {{denominatorUnit}}"
-    }
+    "maxDosePerPeriod": "bis zu einer maximalen Menge von {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/en/common.json

@@ -3,23 +3,39 @@
     "and": "and",
     "then": "then"
   },
+  "amount": {
+    "range": {
+      "withUnit": {
+        "lowAndHigh": "{{low}} to {{high}} {{unit}}",
+        "onlyHigh": "up to {{high}} {{unit}}",
+        "onlyLow": "at least {{low}} {{unit}}"
+      },
+      "withoutUnit": {
+        "lowAndHigh": "{{low}} to {{high}}",
+        "onlyHigh": "up to {{high}}",
+        "onlyLow": "at least {{low}}"
+      }
+    },
+    "ratio": {
+      "withUnit": {
+        "numerator": "{{count}} {{numeratorUnit}}",
+        "denominator_one": "per {{denominatorUnit}}",
+        "denominator_other": "every {{count}} {{denominatorUnit}}"
+      },
+      "withoutUnit": {
+        "numerator": "{{count}}",
+        "denominator_one": ":{{count}}",
+        "denominator_other": ":{{count}}"
+      }
+    },
+    "quantity": "{{quantity}} {{unit}}"
+  },
   "fields": {
     "doseQuantity": "{{quantity}} {{unit}}",
-    "doseRange": {
-      "lowAndHigh": "{{low}} to {{high}} {{unit}}",
-      "onlyHigh": "up to {{high}} {{unit}}",
-      "onlyLow": "{{low}} {{unit}}"
-    },
+    "doseRange": "{{rangeText}}",
     "rateQuantity": "at a rate of {{quantity}} {{unit}}",
-    "rateRange": {
-      "lowAndHigh": "at a rate of {{low}} to {{high}} {{unit}}",
-      "onlyHigh": "at a rate of {{high}} {{unit}}",
-      "onlyLow": "at a rate of {{low}} {{unit}}"
-    },
-    "rateRatio": {
-      "rateRatio_one": "at a rate of {{quantityNumerator}} {{numeratorUnit}} per {{denominatorUnit}}",
-      "rateRatio_other": "at a rate of {{quantityNumerator}} {{numeratorUnit}} every {{count}} {{denominatorUnit}}"
-    },
+    "rateRange": "at a rate of {{rangeText}}",
+    "rateRatio": "at a rate of {{ratioText}}",
     "duration": "over {{durationText}}",
     "durationMax": "(maximum {{durationMaxText}})",
     "frequency": {
@@ -54,11 +70,7 @@
       "onlyStart": "from {{start}}",
       "onlyEnd": "to {{end}}"
     },
-    "boundsRange": {
-      "lowAndHigh": "for {{low}} to {{high}} {{unit}}",
-      "onlyHigh": "for up to {{high}} {{unit}}",
-      "onlyLow": "for at least {{low}} {{unit}}"
-    },
+    "boundsRange": "for {{rangeText}}",
     "count": {
       "count_one": "take {{count}} time",
       "count_other": "take {{count}} times"
@@ -73,10 +85,6 @@
     },
     "maxDosePerLifetime": "up to a maximum of {{count}} {{unit}} for the lifetime of patient",
     "maxDosePerAdministration": "up to a maximum of {{count}} {{unit}} per dose",
-    "maxDosePerPeriod": {
-      "general": "up to a maximum of {{maxDosePerPeriodText}}",
-      "maxDosePerPeriod_one": "{{quantityNumerator}} {{numeratorUnit}} per {{denominatorUnit}}",
-      "maxDosePerPeriod_other": "{{quantityNumerator}} {{numeratorUnit}} every {{count}} {{denominatorUnit}}"
-    }
+    "maxDosePerPeriod": "up to a maximum of {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/fr/common.json

@@ -3,23 +3,39 @@
     "and": "et",
     "then": "puis"
   },
+  "amount": {
+    "range": {
+      "withUnit": {
+        "lowAndHigh": "{{low}} à {{high}} {{unit}}",
+        "onlyHigh": "jusqu'à {{high}} {{unit}}",
+        "onlyLow": "au moins {{low}} {{unit}}"
+      },
+      "withoutUnit": {
+        "lowAndHigh": "{{low}} à {{high}}",
+        "onlyHigh": "jusqu'à {{high}}",
+        "onlyLow": "au moins {{low}}"
+      }
+    },
+    "ratio": {
+      "withUnit": {
+        "numerator": "{{count}} {{numeratorUnit}}",
+        "denominator_one": "par {{denominatorUnit}}",
+        "denominator_other": "chaque {{count}} {{denominatorUnit}}"
+      },
+      "withoutUnit": {
+        "numerator": "{{count}}",
+        "denominator_one": ":{{count}}",
+        "denominator_other": ":{{count}}"
+      }
+    },
+    "quantity": "{{quantity}} {{unit}}"
+  },
   "fields": {
     "doseQuantity": "{{quantity}} {{unit}}",
-    "doseRange": {
-      "lowAndHigh": "{{low}} à {{high}} {{unit}}",
-      "onlyHigh": "jusqu'à {{high}} {{unit}}",
-      "onlyLow": "{{low}} {{unit}}"
-    },
+    "doseRange": "{{rangeText}}",
     "rateQuantity": "au taux de {{quantity}} {{unit}}",
-    "rateRange": {
-      "lowAndHigh": "au taux de {{low}} à {{high}} {{unit}}",
-      "onlyHigh": "au taux de {{high}} {{unit}}",
-      "onlyLow": "au taux de {{low}} {{unit}}"
-    },
-    "rateRatio": {
-      "rateRatio_one": "au taux de {{quantityNumerator}} {{numeratorUnit}} par {{denominatorUnit}}",
-      "rateRatio_other": "au taux de {{quantityNumerator}} {{numeratorUnit}} chaque {{count}} {{denominatorUnit}}"
-    },
+    "rateRange": "au taux de {{rangeText}}",
+    "rateRatio": "au taux de {{ratioText}}",
     "duration": "durant {{durationText}}",
     "durationMax": "(maximum {{durationMaxText}})",
     "frequency": {
@@ -54,11 +70,7 @@
       "onlyStart": "à partir du {{start}}",
       "onlyEnd": "jusqu'au {{end}}"
     },
-    "boundsRange": {
-      "lowAndHigh": "de {{low}} à {{high}} {{unit}}",
-      "onlyHigh": "jusqu'à {{high}} {{unit}}",
-      "onlyLow": "pour au moins {{low}} {{unit}}"
-    },
+    "boundsRange": "pour {{rangeText}}",
     "count": {
       "count_one": "prendre {{count}} fois",
       "count_other": "prendre {{count}} fois"
@@ -73,10 +85,6 @@
     },
     "maxDosePerLifetime": "jusqu'à un maximum de {{count}} {{unit}} pour la durée de vie du patient",
     "maxDosePerAdministration": "jusqu'à un maximum de {{count}} {{unit}} par dose",
-    "maxDosePerPeriod": {
-      "general": "jusqu'à un maximum de {{maxDosePerPeriodText}}",
-      "maxDosePerPeriod_one": "{{quantityNumerator}} {{numeratorUnit}} par {{denominatorUnit}}",
-      "maxDosePerPeriod_other": "{{quantityNumerator}} {{numeratorUnit}} chaque {{count}} {{denominatorUnit}}"
-    }
+    "maxDosePerPeriod": "jusqu'à un maximum de {{maxDosePerPeriodText}}"
   }
 }

package/dist/locales/nl/common.json

@@ -3,23 +3,39 @@
     "and": "en",
     "then": "vervolgens"
   },
+  "amount": {
+    "range": {
+      "withUnit": {
+        "lowAndHigh": "tussen {{low}} en {{high}} {{unit}}",
+        "onlyHigh": "tot {{high}} {{unit}}",
+        "onlyLow": "minstens {{low}} {{unit}}"
+      },
+      "withoutUnit": {
+        "lowAndHigh": "tussen {{low}} en {{high}}",
+        "onlyHigh": "tot {{high}}",
+        "onlyLow": "minstens {{low}}"
+      }
+    },
+    "ratio": {
+      "withUnit": {
+        "numerator": "{{count}} {{numeratorUnit}}",
+        "denominator_one": "per {{denominatorUnit}}",
+        "denominator_other": "elke {{count}} {{denominatorUnit}}"
+      },
+      "withoutUnit": {
+        "numerator": "{{count}}",
+        "denominator_one": ":{{count}}",
+        "denominator_other": ":{{count}}"
+      }
+    },
+    "quantity": "{{quantity}} {{unit}}"
+  },
   "fields": {
     "doseQuantity": "{{quantity}} {{unit}}",
-    "doseRange": {
-      "lowAndHigh": "tussen {{low}} en {{high}} {{unit}}",
-      "onlyHigh": "tot {{high}} {{unit}}",
-      "onlyLow": "{{low}} {{unit}}"
-    },
+    "doseRange": "{{rangeText}}",
     "rateQuantity": "met een verhouding van {{quantity}} {{unit}}",
-    "rateRange": {
-      "lowAndHigh": "met een verhouding tussen {{low}} en {{high}} {{unit}}",
-      "onlyHigh": "met een verhouding van {{high}} {{unit}}",
-      "onlyLow": "met een verhouding van {{low}} {{unit}}"
-    },
-    "rateRatio": {
-      "rateRatio_one": "met een verhouding van {{quantityNumerator}} {{numeratorUnit}} per {{denominatorUnit}}",
-      "rateRatio_other": "met een verhouding van {{quantityNumerator}} {{numeratorUnit}} elke {{count}} {{denominatorUnit}}"
-    },
+    "rateRange": "met een verhouding van {{rangeText}}",
+    "rateRatio": "met een verhouding van {{ratioText}}",
     "duration": "gedurende {{durationText}}",
     "durationMax": "(maximaal {{durationMaxText}})",
     "frequency": {
@@ -54,11 +70,7 @@
       "onlyStart": "van {{start}}",
       "onlyEnd": "tot {{end}}"
     },
-    "boundsRange": {
-      "lowAndHigh": "gedurende {{low}} tot {{high}} {{unit}}",
-      "onlyHigh": "tot {{high}} {{unit}}",
-      "onlyLow": "gedurende minstens {{low}} {{unit}}"
-    },
+    "boundsRange": "gedurende {{rangeText}}",
     "count": {
       "count_one": "{{count}} keer nemen",
       "count_other": "{{count}} keer nemen"
@@ -73,10 +85,6 @@
     },
     "maxDosePerLifetime": "tot een maximum van {{count}} {{unit}} gedurende de levensduur van de patiënt",
     "maxDosePerAdministration": "tot een maximum van {{count}} {{unit}} per dosis",
-    "maxDosePerPeriod": {
-      "general": "tot een maximum van {{maxDosePerPeriodText}}",
-      "maxDosePerPeriod_one": "{{quantityNumerator}} {{numeratorUnit}} per {{denominatorUnit}}",
-      "maxDosePerPeriod_other": "{{quantityNumerator}} {{numeratorUnit}} elke {{count}} {{denominatorUnit}}"
-    }
+    "maxDosePerPeriod": "tot een maximum van {{maxDosePerPeriodText}}"
   }
 }

package/dist/main.js

@@ -72,43 +72,77 @@ function $5ab57a471c359130$export$7de3722258b87db9({ config: config, dos: dos, i
 }
 
 
-// types
-function $9a073aa5b09aa778$export$4cd16590995531a9({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let doseRange = dos.doseAndRate.find((s)=>s.doseRange !== undefined);
-    // If not found, skip
-    if (doseRange === undefined) return undefined;
-    let low = doseRange.doseRange.low?.value;
-    let high = doseRange.doseRange.high?.value;
-    let quantityUnit = doseRange.doseRange.high !== undefined ? doseRange.doseRange.high : doseRange.doseRange.low;
-    // quantity unit
-    let unit = config.fromFHIRQuantityUnitToString({
+// Utility function
+// Quantity unit to string
+function $9ee880701f47723b$var$transformQuantityUnitToString(i18next, quantity, config) {
+    let quantityValue = quantity.value;
+    // If common units from HL7, do the job
+    if (quantity.system === "http://hl7.org/fhir/ValueSet/duration-units") {
+        let code = quantity.code;
+        return i18next.t(`unitsOfTime:withoutCount.${code}`, {
+            count: quantityValue
+        });
+    } else // otherwise, it is UCUM, ... so let the user do the job
+    return config.fromFHIRQuantityUnitToString({
         language: config.language,
-        quantity: quantityUnit
+        quantity: quantity
     });
-    // Three cases
-    // 1. Both low & high are present
-    if (high !== undefined && low !== undefined) return i18next.t("fields.doseRange.lowAndHigh", {
-        low: low,
-        high: high,
+}
+function $9ee880701f47723b$export$be17d167ed50d870({ range: range, config: config, i18next: i18next }) {
+    // Extract params
+    const { low: low, high: high } = range;
+    const lowValue = low?.value;
+    const highValue = high?.value;
+    // prepare unit display
+    let quantityUnit = high || low;
+    let hasUnit = quantityUnit?.unit !== undefined || quantityUnit?.code !== undefined;
+    // Four cases
+    // 1. If we have a empty object, return undefined
+    if (lowValue === undefined && highValue === undefined) return undefined;
+    // quantity unit
+    let unit = hasUnit ? $9ee880701f47723b$var$transformQuantityUnitToString(i18next, quantityUnit, config) : "";
+    let technicalKey = hasUnit ? "withUnit" : "withoutUnit";
+    // 2. Both low & high are present
+    if (lowValue !== undefined && highValue !== undefined) return i18next.t(`amount.range.${technicalKey}.lowAndHigh`, {
+        low: lowValue,
+        high: highValue,
         unit: unit
     });
-    // 2. Only high is present
-    if (high !== undefined) return i18next.t("fields.doseRange.onlyHigh", {
-        high: high,
+    // 3. Only high is present
+    if (highValue !== undefined) return i18next.t(`amount.range.${technicalKey}.onlyHigh`, {
+        high: highValue,
         unit: unit
     });
-    // 3. Only low is present
+    // 4. Only low is present
     // Warning, this case is kind dangerous and clinically unsafe so minimal effort on this ...
-    return i18next.t("fields.doseRange.onlyLow", {
-        low: low,
+    return i18next.t(`amount.range.${technicalKey}.onlyLow`, {
+        low: lowValue,
         unit: unit
     });
 }
 
 
+function $9a073aa5b09aa778$export$4cd16590995531a9({ dos: dos, config: config, i18next: i18next }) {
+    // If empty, return undefined
+    if (dos.doseAndRate === undefined) return undefined;
+    // Find the first entry that match criteria
+    let doseRange = dos.doseAndRate.find((s)=>s.doseRange !== undefined);
+    // If not found, skip
+    if (doseRange === undefined) return undefined;
+    // Turn range into a text
+    const text = (0, $9ee880701f47723b$export$be17d167ed50d870)({
+        range: doseRange.doseRange,
+        config: config,
+        i18next: i18next
+    });
+    // Reject if empty
+    if (text === undefined) return undefined;
+    return i18next.t("fields.doseRange", {
+        rangeText: text
+    });
+}
+
+
 // types
 function $052c79abb28cba29$export$4e24ef8c7997cc56({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
@@ -131,72 +165,91 @@ function $052c79abb28cba29$export$4e24ef8c7997cc56({ dos: dos, config: config, i
 }
 
 
-// types
+// Utility function
+
 function $703b645b55481398$export$d3dd7d3522271dba({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
     if (dos.doseAndRate === undefined) return undefined;
     // Find the first entry that match criteria
-    let rateRange = dos.doseAndRate.find((s)=>s.rateRange !== undefined);
+    let doseAndRate = dos.doseAndRate.find((s)=>s.rateRange !== undefined);
     // If not found, skip
-    if (rateRange === undefined) return undefined;
-    // low / high
-    let low = rateRange.rateRange.low;
-    let high = rateRange.rateRange.high;
-    let quantityLow = low?.value;
-    let quantityHigh = high?.value;
-    // quantity unit
-    let unit = config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: high || low
-    });
-    // Three cases
-    // 1. Both low & high are present
-    if (quantityHigh !== undefined && quantityLow !== undefined) return i18next.t("fields.rateRange.lowAndHigh", {
-        low: quantityLow,
-        high: quantityHigh,
-        unit: unit
-    });
-    // 2. Only high is present
-    if (quantityHigh !== undefined) return i18next.t("fields.rateRange.onlyHigh", {
-        high: quantityHigh,
-        unit: unit
+    if (doseAndRate === undefined) return undefined;
+    // Turn range into a text
+    const rangeText = (0, $9ee880701f47723b$export$be17d167ed50d870)({
+        range: doseAndRate.rateRange,
+        config: config,
+        i18next: i18next
     });
-    // 3. Only low is present
-    // Warning, this case is kind dangerous and clinically unsafe so minimal effort on this ...
-    return i18next.t("fields.rateRange.onlyLow", {
-        low: quantityLow,
-        unit: unit
+    // Reject if empty
+    if (rangeText === undefined) return undefined;
+    // return the final string
+    return i18next.t("fields.rateRange", {
+        rangeText: rangeText
     });
 }
 
 
-// types
-function $301791f33da707fa$export$b71cfd2510242de2({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let rateRatio = dos.doseAndRate.find((s)=>s.rateRatio !== undefined);
-    // If not found, skip
-    if (rateRatio === undefined) return undefined;
-    // num / dem
-    let numerator = rateRatio.rateRatio.numerator;
-    let denominator = rateRatio.rateRatio.denominator;
-    let quantityNum = numerator?.value || 1;
-    let quantityDenom = denominator?.value || 1;
+// Quantity has an unit ?
+function $7895e9944cc835ce$var$hasUnit(quantity) {
+    return (quantity?.unit || quantity?.code) !== undefined;
+}
+function $7895e9944cc835ce$export$fdc6e9cbd31555fb({ ratio: ratio, config: config, i18next: i18next }) {
+    // Extract params
+    const { denominator: denominator, numerator: numerator } = ratio;
     // units as text
-    let numeratorUnit = numerator !== undefined ? config.fromFHIRQuantityUnitToString({
+    let numeratorUnit = $7895e9944cc835ce$var$hasUnit(numerator) ? config.fromFHIRQuantityUnitToString({
         language: config.language,
         quantity: numerator
-    }) : "";
-    let denominatorUnit = denominator !== undefined ? config.fromFHIRQuantityUnitToString({
+    }) : undefined;
+    let denominatorUnit = $7895e9944cc835ce$var$hasUnit(denominator) ? config.fromFHIRQuantityUnitToString({
         language: config.language,
         quantity: denominator
-    }) : "";
-    return i18next.t("fields.rateRatio.rateRatio", {
-        count: quantityDenom,
-        quantityNumerator: quantityNum,
-        numeratorUnit: numeratorUnit,
-        denominatorUnit: denominatorUnit
+    }) : undefined;
+    // quantity
+    let quantityNumerator = numerator?.value;
+    let quantityDenominator = denominator?.value;
+    // Collect
+    const parts = [];
+    // Deal with numerator first
+    if (quantityNumerator !== undefined) {
+        let technicalKey = numeratorUnit !== undefined ? "withUnit" : "withoutUnit";
+        const numeratorString = i18next.t(`amount.ratio.${technicalKey}.numerator`, {
+            count: quantityNumerator,
+            numeratorUnit: numeratorUnit
+        });
+        parts.push(numeratorString);
+    }
+    // Deal with denominator
+    if (quantityDenominator !== undefined) {
+        let technicalKey = denominatorUnit !== undefined ? "withUnit" : "withoutUnit";
+        const denominatorString = i18next.t(`amount.ratio.${technicalKey}.denominator`, {
+            count: quantityDenominator,
+            denominatorUnit: denominatorUnit
+        });
+        parts.push(denominatorString);
+    }
+    // Concatenate the result
+    if (parts.length === 0) return undefined;
+    else return parts.join(" ");
+}
+
+
+function $301791f33da707fa$export$b71cfd2510242de2({ dos: dos, config: config, i18next: i18next }) {
+    // If empty, return undefined
+    if (dos.doseAndRate === undefined) return undefined;
+    // Find the first entry that match criteria
+    let doseAndRate = dos.doseAndRate.find((s)=>s.rateRatio !== undefined);
+    // If not found, skip
+    if (doseAndRate === undefined) return undefined;
+    // Turn ratio to text
+    const ratioText = (0, $7895e9944cc835ce$export$fdc6e9cbd31555fb)({
+        config: config,
+        i18next: i18next,
+        ratio: doseAndRate.rateRatio
+    });
+    if (ratioText === undefined) return undefined;
+    return i18next.t("fields.rateRatio", {
+        ratioText: ratioText
     });
 }
 
@@ -496,21 +549,7 @@ function $9d632517596957df$export$b927a06bc51aea32({ dos: dos, config: config, i
 
 
 // types
-// Quantity unit to string
-function $2da391a8a8345a3d$var$transformQuantityUnitToString(i18next, quantity, config) {
-    let quantityValue = quantity.value;
-    // If common units from HL7, do the job
-    if (quantity.system === "http://hl7.org/fhir/ValueSet/duration-units") {
-        let code = quantity.code;
-        return i18next.t(`unitsOfTime:withoutCount.${code}`, {
-            count: quantityValue
-        });
-    } else // otherwise, it is UCUM, ... so let the user do the job
-    return config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: quantity
-    });
-}
+
 function $2da391a8a8345a3d$export$8c667cbf7bebaa93({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
     if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
@@ -520,26 +559,17 @@ function $2da391a8a8345a3d$export$8c667cbf7bebaa93({ dos: dos, config: config, i
     // Do nothing if no boundsRange, I am not a wizard
     if (boundsRange === undefined) return undefined;
     else {
-        let low = boundsRange.low;
-        let high = boundsRange.high;
-        // quantity unit
-        let unit = $2da391a8a8345a3d$var$transformQuantityUnitToString(i18next, high || low, config);
-        // Three cases
-        // 1. Both low & high are present
-        if (high !== undefined && low !== undefined) return i18next.t("fields.boundsRange.lowAndHigh", {
-            low: low.value,
-            high: high.value,
-            unit: unit
-        });
-        // 2. Only high is present
-        if (high !== undefined) return i18next.t("fields.boundsRange.onlyHigh", {
-            high: high.value,
-            unit: unit
+        // Turn range into a text
+        const rangeText = (0, $9ee880701f47723b$export$be17d167ed50d870)({
+            range: boundsRange,
+            config: config,
+            i18next: i18next
         });
-        // 3. Only low is present
-        return i18next.t("fields.boundsRange.onlyLow", {
-            low: low.value,
-            unit: unit
+        // Reject if empty
+        if (rangeText === undefined) return undefined;
+        // return the final string
+        return i18next.t("fields.boundsRange", {
+            rangeText: rangeText
         });
     }
 }
@@ -764,6 +794,7 @@ function $45256d2a188dcbd7$export$75a89431d80a701a({ dos: dos, config: config, i
 
 
 
+
 function $39ffdeadc450f558$export$346b11a8cb220f02({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
     if (dos.maxDosePerPeriod === undefined) return undefined;
@@ -778,29 +809,14 @@ function $39ffdeadc450f558$export$346b11a8cb220f02({ dos: dos, config: config, i
     if (values.length === 0) return undefined;
     // Periods are expressed as ratio (like rateRatio)
     const valuesAsString = values.map((period)=>{
-        // num / dem
-        let numerator = period.numerator;
-        let denominator = period.denominator;
-        let quantityNum = numerator?.value || 1;
-        let quantityDenom = denominator?.value || 1;
-        // units as text
-        let numeratorUnit = numerator !== undefined ? config.fromFHIRQuantityUnitToString({
-            language: config.language,
-            quantity: numerator
-        }) : "";
-        let denominatorUnit = denominator !== undefined ? config.fromFHIRQuantityUnitToString({
-            language: config.language,
-            quantity: denominator
-        }) : "";
-        return i18next.t("fields.maxDosePerPeriod.maxDosePerPeriod", {
-            count: quantityDenom,
-            quantityNumerator: quantityNum,
-            numeratorUnit: numeratorUnit,
-            denominatorUnit: denominatorUnit
+        return (0, $7895e9944cc835ce$export$fdc6e9cbd31555fb)({
+            config: config,
+            i18next: i18next,
+            ratio: period
         });
-    });
+    }).filter((s)=>s !== undefined);
     const maxDosePerPeriodText = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, valuesAsString);
-    return i18next.t("fields.maxDosePerPeriod.general", {
+    return i18next.t("fields.maxDosePerPeriod", {
         count: values.length,
         maxDosePerPeriodText: maxDosePerPeriodText
     });