@quesmed/types 1.3.4 → 1.3.5

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.5",
   "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,6 +1,6 @@
 "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 floatRegex = /([0-9]*[.])?[0-9]+/gm;
 function mapPrescribeMarkToAnswer(obj) {
@@ -10,7 +10,7 @@ function mapPrescribeMarkToAnswer(obj) {
             display: false,
         },
         dose: {
-            value: obj.dose,
+            value: parseInt(obj.dose),
             display: false,
         },
         units: {
@@ -31,6 +31,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, '');
@@ -76,25 +77,32 @@ function formatPrescribeAnswer(obj) {
         }
         m.forEach((match) => durationMatches.push(match));
     }
-    obj.duration.value = durationMatches.join(',');
+    obj.duration.value = durationMatches.filter((x) => !!x).join(',');
     obj.frequency.value = obj.frequency.value.toLowerCase().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';
+    }
     return obj;
 }
+exports.formatPrescribeAnswer = formatPrescribeAnswer;
 const answerRegex = /answer/gi;
 function correctMark(mark) {
     const data = {
@@ -170,12 +178,19 @@ function correctMark(mark) {
             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;
                 }