@quesmed/types-rn 2.5.64 → 2.5.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types-rn",
-  "version": "2.5.64",
+  "version": "2.5.66",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",

package/utils/commonFunctions.js

@@ -81,6 +81,9 @@ function formatPrescribeAnswer(baseAnswer) {
     else if (obj.route.value.includes('topical')) {
         obj.route.value = 'top';
     }
+    else if (obj.route.value.includes('rectal')) {
+        obj.route.value = 'pr';
+    }
     obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
     if (obj.units.value === 'milligram' || obj.units.value === 'milligrams') {
         obj.units.value = 'mg';
@@ -109,14 +112,19 @@ function formatPrescribeAnswer(baseAnswer) {
     }
     obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
     const orgFrequencyValue = obj.frequency.value.toLowerCase();
+    const timesPerDay = obj.frequency.value.includes('times per day') ||
+        obj.frequency.value.includes('times a day');
+    // remove whitespace for processing
     obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
+    const freqWordsToInt = (0, wordsToNumber_1.wordsToNumber)(orgFrequencyValue, true);
     const frequencyIncHourly = obj.frequency.value.includes('hour');
-    const hourlyFreqInt = parseInt(obj.frequency.value);
+    const textToInt = parseInt(obj.frequency.value);
     if (obj.frequency.value === 'once-off') {
         obj.frequency.value = 'stat';
     }
     else if (obj.frequency.value.includes('once') ||
-        (frequencyIncHourly && hourlyFreqInt === 24)) {
+        (frequencyIncHourly && textToInt === 24) ||
+        (timesPerDay && freqWordsToInt === 1)) {
         obj.frequency.value = 'od';
     }
     else if (obj.frequency.value.includes('nightly') ||
@@ -124,14 +132,17 @@ function formatPrescribeAnswer(baseAnswer) {
         obj.frequency.value = 'od';
     }
     else if (obj.frequency.value.includes('twice') ||
-        (frequencyIncHourly && hourlyFreqInt === 12)) {
+        (frequencyIncHourly && textToInt === 12) ||
+        (timesPerDay && freqWordsToInt === 2)) {
         obj.frequency.value = 'bd';
     }
     else if (obj.frequency.value.includes('trice') ||
-        (frequencyIncHourly && hourlyFreqInt === 8)) {
+        (frequencyIncHourly && textToInt === 8) ||
+        (timesPerDay && freqWordsToInt === 3)) {
         obj.frequency.value = 'tds';
     }
-    else if (frequencyIncHourly && hourlyFreqInt === 6) {
+    else if ((frequencyIncHourly && textToInt === 6) ||
+        (timesPerDay && freqWordsToInt === 4)) {
         obj.frequency.value = 'qds';
     }
     else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {