@quesmed/types 1.0.24 → 1.0.25

package/models/Question.d.ts

@@ -20,7 +20,7 @@ export declare enum EQuestionType {
 export declare type IQuestionAnswer = string | [string] | [string[], string[]] | IPrescribeAnswer[];
 export interface IQuestion {
     id: Id;
-    typeId: EQuestionType;
+    typeId: Id;
     conceptId: Id;
     public: boolean;
     concept?: IConcept;
@@ -59,10 +59,10 @@ export interface IQuestionPrescribe extends IQuestion {
     prescribeAnswer: IPrescribeAnswer[];
 }
 export interface IPrescribeAnswer {
-    dose: number;
     drug: string;
-    route: string;
+    dose: number;
     units: string;
-    duration: string;
+    route: string;
     frequency: string;
+    duration: string;
 }

package/package.json

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

package/utils/commonFunctions.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.correctMark = void 0;
 const models_1 = require("../models");
+const floatRegex = /([0-9]*[.])?[0-9]+/gm;
 function formatPrescribeAnswer(obj) {
     obj.drug = obj.drug.toLowerCase().replace(/\s/g, '');
     obj.route = obj.route.toLowerCase().replace(/\s/g, '');
@@ -23,6 +24,9 @@ function formatPrescribeAnswer(obj) {
     else if (obj.route.includes('nebuli')) {
         obj.route = 'neb';
     }
+    else if (obj.route.includes('topical')) {
+        obj.route = 'top';
+    }
     obj.units = obj.units.toLowerCase().replace(/\s/g, '');
     if (obj.units === 'milligram' || obj.units === 'milligrams') {
         obj.units = 'mg';
@@ -37,11 +41,10 @@ function formatPrescribeAnswer(obj) {
         obj.units = 'units';
     }
     let m;
-    const regex = /\d/gm;
     const durationMatches = [];
-    while ((m = regex.exec(obj.duration)) !== null) {
-        if (m.index === regex.lastIndex) {
-            regex.lastIndex++;
+    while ((m = floatRegex.exec(obj.duration)) !== null) {
+        if (m.index === floatRegex.lastIndex) {
+            floatRegex.lastIndex++;
         }
         m.forEach((match) => durationMatches.push(match));
     }
@@ -51,7 +54,10 @@ function formatPrescribeAnswer(obj) {
         obj.frequency = 'stat';
     }
     else if (obj.frequency.includes('once')) {
-        obj.frequency = 'po';
+        obj.frequency = 'od';
+    }
+    else if (obj.frequency.includes('nightly')) {
+        obj.frequency = 'od';
     }
     else if (obj.frequency.includes('twice')) {
         obj.frequency = 'bd';