@quesmed/types 1.3.5 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.3.5",
+  "version": "1.3.9",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "types": "dist/index.d.ts",

package/utils/commonFunctions.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.correctMark = exports.formatPrescribeAnswer = exports.mapPrescribeMarkToAnswer = void 0;
 const models_1 = require("../models");
+const wordsToNumber_1 = require("./wordsToNumber");
 const floatRegex = /([0-9]*[.])?[0-9]+/gm;
+const ACCEPTED_FREQ = ['stat', 'od', 'bd', 'tds', 'qds'];
 function mapPrescribeMarkToAnswer(obj) {
     return {
         drug: {
@@ -10,7 +12,7 @@ function mapPrescribeMarkToAnswer(obj) {
             display: false,
         },
         dose: {
-            value: parseInt(obj.dose),
+            value: parseFloat(obj.dose),
             display: false,
         },
         units: {
@@ -70,15 +72,20 @@ function formatPrescribeAnswer(obj) {
         obj.units.value = 'units';
     }
     let m;
-    const durationMatches = [];
+    const durationMatches = new Set();
     while ((m = floatRegex.exec(obj.duration.value)) !== null) {
         if (m.index === floatRegex.lastIndex) {
             floatRegex.lastIndex++;
         }
-        m.forEach((match) => durationMatches.push(match));
+        m.forEach((match) => durationMatches.add(match));
     }
-    obj.duration.value = durationMatches.filter((x) => !!x).join(',');
-    obj.frequency.value = obj.frequency.value.toLowerCase().replace(/\s/g, '');
+    const durationWords = (0, wordsToNumber_1.wordsToNumber)(obj.duration.value, false);
+    if (durationWords !== 0) {
+        durationMatches.add(durationWords.toString());
+    }
+    obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
+    const orgFrequencyValue = obj.frequency.value.toLowerCase();
+    obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
     const frequencyIncHourly = obj.frequency.value.includes('hour');
     const hourlyFreqInt = parseInt(obj.frequency.value);
     if (obj.frequency.value === 'once-off') {
@@ -100,6 +107,9 @@ function formatPrescribeAnswer(obj) {
     else if (frequencyIncHourly && hourlyFreqInt === 6) {
         obj.frequency.value = 'qds';
     }
+    else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {
+        obj.frequency.value = (0, wordsToNumber_1.wordsToNumber)(orgFrequencyValue, true).toString();
+    }
     return obj;
 }
 exports.formatPrescribeAnswer = formatPrescribeAnswer;

package/utils/wordsToNumber.d.ts

@@ -0,0 +1 @@
+export declare function wordsToNumber(s: string, checkForDigits?: boolean): number;

package/utils/wordsToNumber.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wordsToNumber = void 0;
+const Small = {
+    zero: 0,
+    one: 1,
+    two: 2,
+    three: 3,
+    four: 4,
+    five: 5,
+    six: 6,
+    seven: 7,
+    eight: 8,
+    nine: 9,
+    ten: 10,
+    eleven: 11,
+    twelve: 12,
+    thirteen: 13,
+    fourteen: 14,
+    fifteen: 15,
+    sixteen: 16,
+    seventeen: 17,
+    eighteen: 18,
+    nineteen: 19,
+    twenty: 20,
+    thirty: 30,
+    forty: 40,
+    fifty: 50,
+    sixty: 60,
+    seventy: 70,
+    eighty: 80,
+    ninety: 90,
+};
+function wordsToNumber(s, checkForDigits = false) {
+    const words = s.toString().split(/[\s-]+/);
+    let total = 0;
+    words.forEach((word) => {
+        const wordKey = Small[word];
+        if (wordKey !== undefined) {
+            total += wordKey;
+        }
+        else if (checkForDigits && !isNaN(parseFloat(word))) {
+            total += parseFloat(word);
+        }
+    });
+    return total;
+}
+exports.wordsToNumber = wordsToNumber;