@quesmed/types 2.5.106 → 2.5.107
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/models/OsceStation.d.ts +2 -0
- package/dist/cjs/resolvers/fragments/osce.js +2 -0
- package/dist/cjs/utils/commonFunctions.js +23 -13
- package/dist/mjs/models/OsceStation.d.ts +2 -0
- package/dist/mjs/resolvers/fragments/osce.js +2 -0
- package/dist/mjs/utils/commonFunctions.js +23 -13
- package/package.json +1 -1
|
@@ -55,7 +55,9 @@ function formatPrescribeAnswer(baseAnswer) {
|
|
|
55
55
|
value: baseAnswer.duration?.value ?? '',
|
|
56
56
|
}),
|
|
57
57
|
});
|
|
58
|
+
// DRUG
|
|
58
59
|
obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
|
|
60
|
+
// ROUTE
|
|
59
61
|
obj.route.value = obj.route.value
|
|
60
62
|
.toLowerCase()
|
|
61
63
|
.replace(/\s/g, '')
|
|
@@ -84,20 +86,26 @@ function formatPrescribeAnswer(baseAnswer) {
|
|
|
84
86
|
else if (obj.route.value.includes('rectal')) {
|
|
85
87
|
obj.route.value = 'pr';
|
|
86
88
|
}
|
|
89
|
+
// UNITS
|
|
87
90
|
obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
91
|
+
switch (obj.units.value) {
|
|
92
|
+
case 'milligram':
|
|
93
|
+
case 'milligrams':
|
|
94
|
+
obj.units.value = 'mg';
|
|
95
|
+
break;
|
|
96
|
+
case 'microgram':
|
|
97
|
+
case 'micrograms':
|
|
98
|
+
obj.units.value = 'mcg';
|
|
99
|
+
break;
|
|
100
|
+
case 'gram':
|
|
101
|
+
case 'grams':
|
|
102
|
+
obj.units.value = 'g';
|
|
103
|
+
break;
|
|
104
|
+
case 'unit':
|
|
105
|
+
obj.units.value = 'units';
|
|
106
|
+
break;
|
|
100
107
|
}
|
|
108
|
+
// DURATION
|
|
101
109
|
let m;
|
|
102
110
|
const durationMatches = new Set();
|
|
103
111
|
while ((m = floatRegex.exec(obj.duration.value)) !== null) {
|
|
@@ -111,6 +119,7 @@ function formatPrescribeAnswer(baseAnswer) {
|
|
|
111
119
|
durationMatches.add(durationWords.toString());
|
|
112
120
|
}
|
|
113
121
|
obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
|
|
122
|
+
// FREQUENCY
|
|
114
123
|
const orgFrequencyValue = obj.frequency.value.toLowerCase();
|
|
115
124
|
const timesPerDay = obj.frequency.value.includes('times per day') ||
|
|
116
125
|
obj.frequency.value.includes('times a day');
|
|
@@ -242,7 +251,8 @@ function correctMark(mark) {
|
|
|
242
251
|
const doseCorrect = answer.dose.display || answer.dose.value === attempt.dose.value;
|
|
243
252
|
const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
|
|
244
253
|
const durationCorrect = answer.duration.display ||
|
|
245
|
-
answer.duration.value.split(',').includes(attempt.duration.value)
|
|
254
|
+
answer.duration.value.split(',').includes(attempt.duration.value) ||
|
|
255
|
+
answer.duration.value === attempt.duration.value;
|
|
246
256
|
const frequencyCorrect = answer.frequency.display ||
|
|
247
257
|
answer.frequency.value === attempt.frequency.value;
|
|
248
258
|
const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
|
|
@@ -51,7 +51,9 @@ export function formatPrescribeAnswer(baseAnswer) {
|
|
|
51
51
|
value: baseAnswer.duration?.value ?? '',
|
|
52
52
|
}),
|
|
53
53
|
});
|
|
54
|
+
// DRUG
|
|
54
55
|
obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
|
|
56
|
+
// ROUTE
|
|
55
57
|
obj.route.value = obj.route.value
|
|
56
58
|
.toLowerCase()
|
|
57
59
|
.replace(/\s/g, '')
|
|
@@ -80,20 +82,26 @@ export function formatPrescribeAnswer(baseAnswer) {
|
|
|
80
82
|
else if (obj.route.value.includes('rectal')) {
|
|
81
83
|
obj.route.value = 'pr';
|
|
82
84
|
}
|
|
85
|
+
// UNITS
|
|
83
86
|
obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
switch (obj.units.value) {
|
|
88
|
+
case 'milligram':
|
|
89
|
+
case 'milligrams':
|
|
90
|
+
obj.units.value = 'mg';
|
|
91
|
+
break;
|
|
92
|
+
case 'microgram':
|
|
93
|
+
case 'micrograms':
|
|
94
|
+
obj.units.value = 'mcg';
|
|
95
|
+
break;
|
|
96
|
+
case 'gram':
|
|
97
|
+
case 'grams':
|
|
98
|
+
obj.units.value = 'g';
|
|
99
|
+
break;
|
|
100
|
+
case 'unit':
|
|
101
|
+
obj.units.value = 'units';
|
|
102
|
+
break;
|
|
96
103
|
}
|
|
104
|
+
// DURATION
|
|
97
105
|
let m;
|
|
98
106
|
const durationMatches = new Set();
|
|
99
107
|
while ((m = floatRegex.exec(obj.duration.value)) !== null) {
|
|
@@ -107,6 +115,7 @@ export function formatPrescribeAnswer(baseAnswer) {
|
|
|
107
115
|
durationMatches.add(durationWords.toString());
|
|
108
116
|
}
|
|
109
117
|
obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
|
|
118
|
+
// FREQUENCY
|
|
110
119
|
const orgFrequencyValue = obj.frequency.value.toLowerCase();
|
|
111
120
|
const timesPerDay = obj.frequency.value.includes('times per day') ||
|
|
112
121
|
obj.frequency.value.includes('times a day');
|
|
@@ -237,7 +246,8 @@ export function correctMark(mark) {
|
|
|
237
246
|
const doseCorrect = answer.dose.display || answer.dose.value === attempt.dose.value;
|
|
238
247
|
const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
|
|
239
248
|
const durationCorrect = answer.duration.display ||
|
|
240
|
-
answer.duration.value.split(',').includes(attempt.duration.value)
|
|
249
|
+
answer.duration.value.split(',').includes(attempt.duration.value) ||
|
|
250
|
+
answer.duration.value === attempt.duration.value;
|
|
241
251
|
const frequencyCorrect = answer.frequency.display ||
|
|
242
252
|
answer.frequency.value === attempt.frequency.value;
|
|
243
253
|
const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
|