@quesmed/types 2.5.63 → 2.5.65

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.
@@ -46,9 +46,9 @@ exports.PRESETS = (0, client_1.gql) `
46
46
  }
47
47
  `;
48
48
  exports.PRESET = (0, client_1.gql) `
49
- query Preset($id: Int) {
49
+ query Preset($id: Int!) {
50
50
  restricted {
51
- presets(id: $id) {
51
+ preset(id: $id) {
52
52
  id
53
53
  createdAt
54
54
  updatedAt
@@ -109,14 +109,19 @@ function formatPrescribeAnswer(baseAnswer) {
109
109
  }
110
110
  obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
111
111
  const orgFrequencyValue = obj.frequency.value.toLowerCase();
112
+ const timesPerDay = obj.frequency.value.includes('times per day') ||
113
+ obj.frequency.value.includes('times a day');
114
+ // remove whitespace for processing
112
115
  obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
116
+ const freqWordsToInt = (0, wordsToNumber_1.wordsToNumber)(orgFrequencyValue, true);
113
117
  const frequencyIncHourly = obj.frequency.value.includes('hour');
114
- const hourlyFreqInt = parseInt(obj.frequency.value);
118
+ const textToInt = parseInt(obj.frequency.value);
115
119
  if (obj.frequency.value === 'once-off') {
116
120
  obj.frequency.value = 'stat';
117
121
  }
118
122
  else if (obj.frequency.value.includes('once') ||
119
- (frequencyIncHourly && hourlyFreqInt === 24)) {
123
+ (frequencyIncHourly && textToInt === 24) ||
124
+ (timesPerDay && freqWordsToInt === 1)) {
120
125
  obj.frequency.value = 'od';
121
126
  }
122
127
  else if (obj.frequency.value.includes('nightly') ||
@@ -124,14 +129,17 @@ function formatPrescribeAnswer(baseAnswer) {
124
129
  obj.frequency.value = 'od';
125
130
  }
126
131
  else if (obj.frequency.value.includes('twice') ||
127
- (frequencyIncHourly && hourlyFreqInt === 12)) {
132
+ (frequencyIncHourly && textToInt === 12) ||
133
+ (timesPerDay && freqWordsToInt === 2)) {
128
134
  obj.frequency.value = 'bd';
129
135
  }
130
136
  else if (obj.frequency.value.includes('trice') ||
131
- (frequencyIncHourly && hourlyFreqInt === 8)) {
137
+ (frequencyIncHourly && textToInt === 8) ||
138
+ (timesPerDay && freqWordsToInt === 3)) {
132
139
  obj.frequency.value = 'tds';
133
140
  }
134
- else if (frequencyIncHourly && hourlyFreqInt === 6) {
141
+ else if ((frequencyIncHourly && textToInt === 6) ||
142
+ (timesPerDay && freqWordsToInt === 4)) {
135
143
  obj.frequency.value = 'qds';
136
144
  }
137
145
  else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {
@@ -43,9 +43,9 @@ export const PRESETS = gql `
43
43
  }
44
44
  `;
45
45
  export const PRESET = gql `
46
- query Preset($id: Int) {
46
+ query Preset($id: Int!) {
47
47
  restricted {
48
- presets(id: $id) {
48
+ preset(id: $id) {
49
49
  id
50
50
  createdAt
51
51
  updatedAt
@@ -105,14 +105,19 @@ export function formatPrescribeAnswer(baseAnswer) {
105
105
  }
106
106
  obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
107
107
  const orgFrequencyValue = obj.frequency.value.toLowerCase();
108
+ const timesPerDay = obj.frequency.value.includes('times per day') ||
109
+ obj.frequency.value.includes('times a day');
110
+ // remove whitespace for processing
108
111
  obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
112
+ const freqWordsToInt = wordsToNumber(orgFrequencyValue, true);
109
113
  const frequencyIncHourly = obj.frequency.value.includes('hour');
110
- const hourlyFreqInt = parseInt(obj.frequency.value);
114
+ const textToInt = parseInt(obj.frequency.value);
111
115
  if (obj.frequency.value === 'once-off') {
112
116
  obj.frequency.value = 'stat';
113
117
  }
114
118
  else if (obj.frequency.value.includes('once') ||
115
- (frequencyIncHourly && hourlyFreqInt === 24)) {
119
+ (frequencyIncHourly && textToInt === 24) ||
120
+ (timesPerDay && freqWordsToInt === 1)) {
116
121
  obj.frequency.value = 'od';
117
122
  }
118
123
  else if (obj.frequency.value.includes('nightly') ||
@@ -120,14 +125,17 @@ export function formatPrescribeAnswer(baseAnswer) {
120
125
  obj.frequency.value = 'od';
121
126
  }
122
127
  else if (obj.frequency.value.includes('twice') ||
123
- (frequencyIncHourly && hourlyFreqInt === 12)) {
128
+ (frequencyIncHourly && textToInt === 12) ||
129
+ (timesPerDay && freqWordsToInt === 2)) {
124
130
  obj.frequency.value = 'bd';
125
131
  }
126
132
  else if (obj.frequency.value.includes('trice') ||
127
- (frequencyIncHourly && hourlyFreqInt === 8)) {
133
+ (frequencyIncHourly && textToInt === 8) ||
134
+ (timesPerDay && freqWordsToInt === 3)) {
128
135
  obj.frequency.value = 'tds';
129
136
  }
130
- else if (frequencyIncHourly && hourlyFreqInt === 6) {
137
+ else if ((frequencyIncHourly && textToInt === 6) ||
138
+ (timesPerDay && freqWordsToInt === 4)) {
131
139
  obj.frequency.value = 'qds';
132
140
  }
133
141
  else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quesmed/types",
3
- "version": "2.5.63",
3
+ "version": "2.5.65",
4
4
  "description": "Typescript types for Quesmed",
5
5
  "keywords": [
6
6
  "quesmed",