Skip to content

Commit ed6f92d

Browse files
smalho01smalho01
authored
update prefetch with pharmacy ref (#169)
* update prefetch with pharmacy ref * fix the prefetch bug * update request generator to use healthcareservice for pharmacy id * fix the context issue * remove pharmacy from context in request builder * run prettier/lint * remove pharmacyid from queries * have the prefetch pharmacy setting work * add settings config for pharmacy id
1 parent 3414bc9 commit ed6f92d

File tree

24 files changed

+524
-347
lines changed

24 files changed

+524
-347
lines changed

‎.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ VITE_USER = alice
2626
VITE_HOOK_TO_SEND = patient-view
2727
VITE_URL_FILTER = http://localhost:3000/*
2828
VITE_USE_INTERMEDIARY = false
29+
VITE_USE_PHARMACY_IN_PREFETCH = true
2930
VITE_INTERMEDIARY = http://localhost:3003
3031
VITE_DISABLE_MEDICATION_STATUS = false
32+
VITE_PHARMACY_ID = pharm0111

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ Following are a list of modifiable paths:
134134
| VITE_URL | `http://localhost:3000` | The base url of this app. Should be modified if the port or domain change. |
135135
| VITE_USER | `alice` | The default user to login as when opening the app. |
136136
| VITE_USE_INTERMEDIARY | false | When true, the app will send all CDS Hooks and REMS ETASU check calls to the intermediary defined in VITE_INTERMEDIARY. |
137-
| VITE_INTERMEDIARY | `http://localhost:3030` | The base url of the intermediary. |
137+
| VITE_INTERMEDIARY | `http:/localhost:3030` | The base url of the intermediary. |
138+
| VITE_USE_PHARMACY_IN_PREFETCH | true | When true, the app will send pharmacy information to the rems admin in the CDS Hooks prefetch |
139+
| VITE_PHARMACY_ID | `pharm0111` | The pharmacy ID to use in the CDS Hooks Prefetch |
138140

139141
# Data Rights
140142
This repository has been forked from the [HL7-DaVinci/crd-request-generator](https://github.com/HL7-DaVinci/crd-request-generator) repository. As such, the following data rights apply to all changes made on this fork of the repository, starting with release 0.1 and onward.

‎src/PrefetchTemplate.js‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
// Prefetch Template Source:
22
// https://build.fhir.org/ig/HL7/davinci-crd/hooks.html#prefetch
33
export class PrefetchTemplate {
4-
static generatePrefetchMap() {
4+
static generatePrefetchMap(settings = null) {
5+
// If no settings provided, use defaults from data.js
6+
const includePharmacy = settings?.includePharmacyInPreFetch ??
7+
headerDefinitions.includePharmacyInPreFetch.default;
8+
const pharmacyId = settings?.pharmacyId ??
9+
headerDefinitions.pharmacyId.default;
10+
511
const prefetchMap = new Map();
612

713
const PRACTITIONER_PREFETCH = new PrefetchTemplate('{{context.userId}}');
8-
914
const REQUEST_PREFETCH = new PrefetchTemplate(
1015
'MedicationRequest/{{context.medications.MedicationRequest.id}}'
1116
);
1217
const PATIENT_PREFETCH = new PrefetchTemplate('{{context.patientId}}');
13-
1418
const ALL_REQUESTS_PREFETCH = new PrefetchTemplate(
1519
'MedicationRequest?subject={{context.patientId}}&_include=MedicationRequest:medication'
1620
);
1721

18-
// prefetchMap.set("Coverage", COVERAGE_PREFETCH_QUERY);
22+
// Core prefetch items (always included)
1923
prefetchMap.set('request', REQUEST_PREFETCH);
2024
prefetchMap.set('practitioner', PRACTITIONER_PREFETCH);
2125
prefetchMap.set('patient', PATIENT_PREFETCH);
2226
prefetchMap.set('medicationRequests', ALL_REQUESTS_PREFETCH);
23-
// prefetchMap.set("ServiceRequest", SERVICE_REQUEST_BUNDLE);
24-
// prefetchMap.set("Encounter", ENCOUNTER_BUNDLE);
27+
28+
// Optional pharmacy prefetch based on settings
29+
if (includePharmacy && pharmacyId) {
30+
const PHARMACY_PREFETCH = new PrefetchTemplate(`HealthcareService/${pharmacyId}`);
31+
prefetchMap.set('pharmacy', PHARMACY_PREFETCH);
32+
}
2533

2634
return prefetchMap;
2735
}
@@ -47,27 +55,49 @@ export class PrefetchTemplate {
4755
return paramElementMap;
4856
}
4957

50-
static generateQueries(requestBundle, patientReference, userReference, ...prefetchKeys) {
58+
static generateQueries(
59+
requestBundle,
60+
patientReference,
61+
userReference,
62+
settings = null,
63+
...prefetchKeys
64+
) {
65+
const prefetchMap = PrefetchTemplate.generatePrefetchMap(settings);
66+
const paramElementMap = PrefetchTemplate.generateParamElementMap();
67+
5168
var resolvedQueries = new Map();
5269
for (var i = 0; i < prefetchKeys.length; i++) {
5370
var prefetchKey = prefetchKeys[i];
71+
if (!prefetchKey || !prefetchMap.has(prefetchKey)) continue;
5472
var query = prefetchMap.get(prefetchKey).getQuery();
5573
// Regex source: https://regexland.com/all-between-specified-characters/
5674
var parametersToFill = query.match(/(?<={{).*?(?=}})/gs);
5775
var resolvedQuery = query.slice();
58-
for (var j = 0; j < parametersToFill.length; j++) {
59-
var unresolvedParameter = parametersToFill[j];
60-
var resolvedParameter;
61-
if (requestBundle) {
62-
resolvedParameter = PrefetchTemplate.resolveParameter(unresolvedParameter, requestBundle);
63-
} else {
64-
if (unresolvedParameter === 'context.patientId') {
65-
resolvedParameter = patientReference;
66-
} else if (unresolvedParameter === 'context.userId') {
67-
resolvedParameter = userReference;
76+
77+
if (parametersToFill) {
78+
for (var j = 0; j < parametersToFill.length; j++) {
79+
var unresolvedParameter = parametersToFill[j];
80+
var resolvedParameter;
81+
if (requestBundle) {
82+
resolvedParameter = PrefetchTemplate.resolveParameter(
83+
unresolvedParameter,
84+
requestBundle,
85+
paramElementMap
86+
);
87+
} else {
88+
if (unresolvedParameter === 'context.patientId') {
89+
resolvedParameter = patientReference;
90+
} else if (unresolvedParameter === 'context.userId') {
91+
resolvedParameter = userReference;
92+
}
93+
}
94+
if (resolvedParameter) {
95+
resolvedQuery = resolvedQuery.replace(
96+
'{{' + unresolvedParameter + '}}',
97+
resolvedParameter
98+
);
6899
}
69100
}
70-
resolvedQuery = resolvedQuery.replace('{{' + unresolvedParameter + '}}', resolvedParameter);
71101
}
72102
resolvedQueries.set(prefetchKey, resolvedQuery);
73103
}
@@ -89,8 +119,9 @@ export class PrefetchTemplate {
89119
}
90120
}
91121

92-
static resolveParameter(unresolvedParameter, requestBundle) {
122+
static resolveParameter(unresolvedParameter, requestBundle, paramElementMap) {
93123
const paramField = paramElementMap.get(unresolvedParameter);
124+
if (!paramField) return null;
94125
const resolvedParameter = PrefetchTemplate.getProp(requestBundle, paramField);
95126
return resolvedParameter;
96127
}
@@ -104,7 +135,4 @@ export class PrefetchTemplate {
104135
getQuery() {
105136
return this.query;
106137
}
107-
}
108-
109-
const prefetchMap = PrefetchTemplate.generatePrefetchMap();
110-
const paramElementMap = PrefetchTemplate.generateParamElementMap();
138+
}

‎src/components/App.jsx‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,24 @@ const App = () => {
2828
<Router>
2929
<Routes>
3030
<Route path="/launch" element={<Launch redirect={redirect} />} />
31-
<Route path="/index" element={<ThemeProvider theme={theme}><Index/></ThemeProvider>} />
31+
<Route
32+
path="/index"
33+
element={
34+
<ThemeProvider theme={theme}>
35+
<Index />
36+
</ThemeProvider>
37+
}
38+
/>
3239
<Route path="/register" element={<RegisterPage />} />
3340
{/* forcibly enter backoffice workflow */}
34-
<Route path="/index/backoffice" element={<ThemeProvider theme={theme}><Index backoffice={true}/></ThemeProvider> } />
41+
<Route
42+
path="/index/backoffice"
43+
element={
44+
<ThemeProvider theme={theme}>
45+
<Index backoffice={true} />
46+
</ThemeProvider>
47+
}
48+
/>
3549
<Route
3650
path="/patient-portal"
3751
element={

‎src/components/RequestBox/PatientSearchBar/PatientSearchBar.jsx‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,33 @@ const PatientSearchBar = props => {
4545
<Box className="search-box-container">
4646
<Grid container>
4747
<Grid item xs={9}>
48-
<span className="search-header">
49-
<p>Filter patient list</p>
50-
<Autocomplete
51-
className="search-box"
52-
disablePortal
53-
id="search-box"
54-
onInputChange={(event, newInputValue) => {
55-
setInput(newInputValue.toLowerCase());
56-
}}
57-
options={listOfPatients[0].map(item => item.name)}
58-
renderInput={params => <TextField {...params} label="Search" />}
59-
/>
60-
<p>
61-
Showing {getFilteredLength(input, listOfPatients)} of {props.searchablePatients.length}{' '}
62-
records
63-
</p>
64-
</span>
48+
<span className="search-header">
49+
<p>Filter patient list</p>
50+
<Autocomplete
51+
className="search-box"
52+
disablePortal
53+
id="search-box"
54+
onInputChange={(event, newInputValue) => {
55+
setInput(newInputValue.toLowerCase());
56+
}}
57+
options={listOfPatients[0].map(item => item.name)}
58+
renderInput={params => <TextField {...params} label="Search" />}
59+
/>
60+
<p>
61+
Showing {getFilteredLength(input, listOfPatients)} of{' '}
62+
{props.searchablePatients.length} records
63+
</p>
64+
</span>
6565
</Grid>
6666
<Grid item xs={3}>
67-
<Button variant="contained" startIcon={<PeopleIcon />} onClick={() => { showAllPatients(); }} style={{padding:'10px','paddingLeft':'20px', 'paddingRight':'20px'}}>
67+
<Button
68+
variant="contained"
69+
startIcon={<PeopleIcon />}
70+
onClick={() => {
71+
showAllPatients();
72+
}}
73+
style={{ padding: '10px', paddingLeft: '20px', paddingRight: '20px' }}
74+
>
6875
Select all Patients
6976
</Button>
7077
</Grid>

‎src/components/RequestBox/RequestBox.jsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ const RequestBox = props => {
182182

183183
let userId = prefetchedResources?.practitioner?.id;
184184
if (!userId) {
185-
console.log(
186-
'Practitioner not populated from prefetch, using user: ' + user
187-
);
185+
console.log('Practitioner not populated from prefetch, using user: ' + user);
188186
userId = user;
189187
}
190188

‎src/components/RequestDashboard/Home.jsx‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,37 @@ const Home = props => {
6464
}
6565
return (
6666
<div>
67-
<Grid className={gridClass} item container justifyContent={'center'} alignItems={'center'}>
68-
{section ? '' : <Grid item xs={3}></Grid>} {/* spacer */}
69-
{renderMainButton(patientButton, <PersonIcon className={classes.mainIcon} />)}
70-
{renderMainButton(taskButton, <AssignmentIcon className={classes.mainIcon} />)}
71-
{renderMainButton(settingsButton, <SettingsIcon className={classes.mainIcon} />)}
72-
{section ? (
73-
<Grid className={classes.spacer} item xs={0}>
74-
<span className={classes.titleIcon}>
75-
<MedicalServicesIcon sx={{ fontSize: 48, verticalAlign: 'middle' }} />&nbsp;&nbsp;<strong>EHR</strong> Request Generator
76-
</span>
77-
</Grid>
78-
) : (
79-
<Grid item xs={3}></Grid>
80-
)}
81-
{/* spacer */}
82-
{/** */}
83-
{section ? (
84-
<Grid className={classes.spacer} item xs={4}>
85-
<span className={classes.loginIcon}>
86-
<AccountBoxIcon sx={{ fontSize: 48, verticalAlign: 'middle' }} /> {token.name}
87-
<Button variant="outlined" className={classes.whiteButton} onClick={logout}>
88-
Logout
89-
</Button>
90-
</span>
91-
</Grid>
92-
) : (
93-
<Grid item xs={3}></Grid>
94-
)}
95-
{/**/}
96-
</Grid>
67+
<Grid className={gridClass} item container justifyContent={'center'} alignItems={'center'}>
68+
{section ? '' : <Grid item xs={3}></Grid>} {/* spacer */}
69+
{renderMainButton(patientButton, <PersonIcon className={classes.mainIcon} />)}
70+
{renderMainButton(taskButton, <AssignmentIcon className={classes.mainIcon} />)}
71+
{renderMainButton(settingsButton, <SettingsIcon className={classes.mainIcon} />)}
72+
{section ? (
73+
<Grid className={classes.spacer} item xs={0}>
74+
<span className={classes.titleIcon}>
75+
<MedicalServicesIcon sx={{ fontSize: 48, verticalAlign: 'middle' }} />
76+
&nbsp;&nbsp;<strong>EHR</strong> Request Generator
77+
</span>
78+
</Grid>
79+
) : (
80+
<Grid item xs={3}></Grid>
81+
)}
82+
{/* spacer */}
83+
{/** */}
84+
{section ? (
85+
<Grid className={classes.spacer} item xs={4}>
86+
<span className={classes.loginIcon}>
87+
<AccountBoxIcon sx={{ fontSize: 48, verticalAlign: 'middle' }} /> {token.name}
88+
<Button variant="outlined" className={classes.whiteButton} onClick={logout}>
89+
Logout
90+
</Button>
91+
</span>
92+
</Grid>
93+
) : (
94+
<Grid item xs={3}></Grid>
95+
)}
96+
{/**/}
97+
</Grid>
9798
</div>
9899
);
99100
};

‎src/components/RequestDashboard/PatientSection.jsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ const PatientSection = props => {
88
return (
99
<div>
1010
{state.startup ? (
11-
<RequestBuilder globalState={state} dispatch={dispatch} client={props.client} userId={props.userId} />
11+
<RequestBuilder
12+
globalState={state}
13+
dispatch={dispatch}
14+
client={props.client}
15+
userId={props.userId}
16+
/>
1217
) : (
1318
<>Loading...</>
1419
)}

‎src/components/RequestDashboard/SettingsSection.jsx‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import { SettingsContext } from '../../containers/ContextProvider/SettingsProvid
3939
const ENDPOINT = [ORDER_SIGN, ORDER_SELECT, PATIENT_VIEW, ENCOUNTER_START, REMS_ETASU];
4040

4141
const SettingsSection = props => {
42-
const [state, dispatch, updateSetting, readSettings, saveSettings] = React.useContext(SettingsContext);
42+
const [state, dispatch, updateSetting, readSettings, saveSettings] =
43+
React.useContext(SettingsContext);
4344

4445
const fieldHeaders = Object.keys(headerDefinitions)
4546
.map(key => ({ ...headerDefinitions[key], key }))
@@ -94,7 +95,7 @@ const SettingsSection = props => {
9495
});
9596
};
9697

97-
const clearResource =
98+
const clearResource =
9899
({ ehrUrl, access_token }, type) =>
99100
() => {
100101
console.log('Clear ' + type + 's from the EHR: ' + ehrUrl);
@@ -151,19 +152,19 @@ const SettingsSection = props => {
151152
display: 'Clear EHR In-Progress Forms',
152153
key: 'clearQuestionnaireResponses',
153154
reset: clearResource,
154-
parameter: 'QuestionnaireResponse'
155+
parameter: 'QuestionnaireResponse'
155156
},
156157
{
157158
display: 'Clear EHR Dispense Statuses',
158159
key: 'clearMedicationDispenses',
159160
reset: clearResource,
160-
parameter: 'MedicationDispense'
161+
parameter: 'MedicationDispense'
161162
},
162163
{
163164
display: 'Clear EHR Tasks',
164165
key: 'clearTasks',
165166
reset: clearResource,
166-
parameter: 'Task'
167+
parameter: 'Task'
167168
},
168169
{
169170
display: 'Reconnect EHR',
@@ -184,17 +185,19 @@ const SettingsSection = props => {
184185
case 'input':
185186
return (
186187
<Grid key={key} item xs={6}>
187-
{ ( (state['useDefaultUser'] && key === 'defaultUser') || key != 'defaultUser' ) ? (
188-
<div>
189-
<TextField
190-
label={display}
191-
variant="outlined"
192-
value={state[key]}
193-
onChange={event => updateSetting(key, event.target.value)}
194-
sx={{ width: '100%' }}
195-
/>
196-
</div>
197-
) : ('') }
188+
{(state['useDefaultUser'] && key === 'defaultUser') || key != 'defaultUser' ? (
189+
<div>
190+
<TextField
191+
label={display}
192+
variant="outlined"
193+
value={state[key]}
194+
onChange={event => updateSetting(key, event.target.value)}
195+
sx={{ width: '100%' }}
196+
/>
197+
</div>
198+
) : (
199+
''
200+
)}
198201
</Grid>
199202
);
200203
case 'check':

0 commit comments

Comments
 (0)