@quesmed/types 1.3.4 → 1.3.8

package/models/Question.d.ts

@@ -82,7 +82,7 @@ export interface IPrescribeAnswer {
 }
 export interface IPrescribeMark {
     drug: string;
-    dose: number;
+    dose: number | string;
     units: string;
     route: string;
     frequency: string;

package/package.json

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

package/utils/commonFunctions.d.ts

@@ -1,4 +1,6 @@
-import { IMarksheetMark } from '../models';
+import { IMarksheetMark, IPrescribeAnswer, IPrescribeMark } from '../models';
+export declare function mapPrescribeMarkToAnswer(obj: IPrescribeMark): IPrescribeAnswer;
+export declare function formatPrescribeAnswer(obj: IPrescribeAnswer): IPrescribeAnswer;
 export interface ICorrectMarkData {
     correct: boolean;
     incorrect: boolean;

package/utils/commonFunctions.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.correctMark = void 0;
+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: obj.dose,
+            value: parseFloat(obj.dose),
             display: false,
         },
         units: {
@@ -31,6 +33,7 @@ function mapPrescribeMarkToAnswer(obj) {
         },
     };
 }
+exports.mapPrescribeMarkToAnswer = mapPrescribeMarkToAnswer;
 function formatPrescribeAnswer(obj) {
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
     obj.route.value = obj.route.value.toLowerCase().replace(/\s/g, '');
@@ -69,32 +72,47 @@ 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.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') {
         obj.frequency.value = 'stat';
     }
-    else if (obj.frequency.value.includes('once')) {
+    else if (obj.frequency.value.includes('once') || (frequencyIncHourly && hourlyFreqInt === 24)) {
         obj.frequency.value = 'od';
     }
     else if (obj.frequency.value.includes('nightly')) {
         obj.frequency.value = 'od';
     }
-    else if (obj.frequency.value.includes('twice')) {
+    else if (obj.frequency.value.includes('twice') ||
+        (frequencyIncHourly && hourlyFreqInt === 12)) {
         obj.frequency.value = 'bd';
     }
-    else if (obj.frequency.value.includes('trice')) {
+    else if (obj.frequency.value.includes('trice') || (frequencyIncHourly && hourlyFreqInt === 8)) {
         obj.frequency.value = 'tds';
     }
+    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;
 const answerRegex = /answer/gi;
 function correctMark(mark) {
     const data = {
@@ -155,6 +173,7 @@ function correctMark(mark) {
             }
         }
         else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
+            console.log('answers');
             const answers = answer.map(formatPrescribeAnswer);
             let attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer({
                 drug: '',
@@ -164,18 +183,26 @@ function correctMark(mark) {
                 frequency: '',
                 duration: '',
             }));
+            console.log('attempt');
             if (typeof flatAttempt === 'object' && Object.keys(flatAttempt).length === 6) {
                 attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
             }
             let foundCorrect = false;
             let index = 0;
             for (const answer of answers) {
-                if (answer.dose.value === attempt.dose.value &&
-                    answer.drug.value === attempt.drug.value &&
-                    answer.duration.value.split(',').includes(attempt.duration.value) &&
-                    answer.frequency.value === attempt.frequency.value &&
-                    answer.route.value === attempt.route.value &&
-                    answer.units.value === attempt.units.value) {
+                const doseCorrect = answer.dose.display || answer.dose.value === attempt.dose.value;
+                const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
+                const durationCorrect = answer.duration.display ||
+                    answer.duration.value.split(',').includes(attempt.duration.value);
+                const frequencyCorrect = answer.frequency.display || answer.frequency.value === attempt.frequency.value;
+                const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
+                const unitsCorrect = answer.units.display || answer.units.value === attempt.units.value;
+                if (doseCorrect &&
+                    drugCorrect &&
+                    durationCorrect &&
+                    frequencyCorrect &&
+                    routeCorrect &&
+                    unitsCorrect) {
                     foundCorrect = true;
                     break;
                 }

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;