Skip to content

Commit 72560f9

Browse files
smalho01smalho01
authored
Merge pull request #72 from mcode/dev
Dev
2 parents 0d2b0a0 + 4f92fd9 commit 72560f9

19 files changed

Lines changed: 227 additions & 128 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# EHR FHIR Server
22

3-
This subproject hosts a HAPI FHIR server that is based on the now-deprecated [hapi-fhir-jpaserver-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example). The new repo is found [here](https://github.com/hapifhir/hapi-fhir-jpaserver-starter).
3+
This sub-project hosts a HAPI FHIR server that is based on the now-deprecated [hapi-fhir-jpaserver-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example). The new repo is found [here](https://github.com/hapifhir/hapi-fhir-jpaserver-starter).
44

55
## Running the server
66

‎bundlefile/HypoxemiaPatientBundle.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
],
204204
"address": {
205205
"line": [
206-
"773 Wiseman Street"
206+
"773 Wiseman Street"
207207
],
208208
"city": "Knoxville",
209209
"state": "Tennessee",

‎dockerRunnerDev.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ echo "loading data into test-ehr..."
2121
gradle loadData
2222

2323
# Continuous Load Data command whenever fhirResourcesToLoad directory changes
24-
reources_modify_time=$(stat -c %Y fhirResourcesToLoad)
24+
resources_modify_time=$(stat -c %Y fhirResourcesToLoad)
2525
while sleep 1
2626
do
27-
new_reources_modify_time=$(stat -c %Y fhirResourcesToLoad)
27+
new_resources_modify_time=$(stat -c %Y fhirResourcesToLoad)
2828

29-
if [[ "$reources_modify_time" != "$new_reources_modify_time" ]]
29+
if [[ "$resources_modify_time" != "$new_resources_modify_time" ]]
3030
then
3131
echo "loading data into test-ehr..."
3232
gradle loadData
3333
fi
3434

35-
reources_modify_time=$new_reources_modify_time
35+
resources_modify_time=$new_resources_modify_time
3636

3737
done ) & LOAD_DATA_PID=$!
3838

‎fhirResourcesToLoad/medication_turalio.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{
3232
"system": "http://snomed.info/sct",
3333
"code": "2183126",
34-
"display": "Product containing only turaliio"
34+
"display": "Product containing only turalio"
3535
}
3636
]
3737
},

‎fhirResourcesToLoad/rems_smith_medicationstatement_turalio.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"system": "http://snomed.info/sct",
3232
"code": "2183126",
33-
"display": "Product containing only turaliio"
33+
"display": "Product containing only turalio"
3434
}
3535
]
3636
},

‎fhirResourcesToLoad/rems_snow_medicationrequest_acetaminophen.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"resourceType": "MedicationRequest",
3+
"id": "pat017-mr-acetaminophen",
4+
"meta": {
5+
"versionId": "1",
6+
"lastUpdated": "2023-12-18T21:12:33.000+00:00",
7+
"source": "#aquj6ECLPVYNYbuX",
8+
"profile": [
9+
"http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest"
10+
]
11+
},
12+
"identifier": [
13+
{
14+
"type": {
15+
"coding": [
16+
{
17+
"system": "http://terminology.hl7.org/CodeSystem/v2-0203",
18+
"code": "PLAC",
19+
"display": "Placer Identifier"
20+
}
21+
]
22+
},
23+
"system": "http://myprescribingsystem.com/ordernumber",
24+
"value": "605153"
25+
}
26+
],
27+
"status": "draft",
28+
"intent": "order",
29+
"medicationCodeableConcept": {
30+
"coding": [
31+
{
32+
"system": "http://www.nlm.nih.gov/research/umls/rxnorm",
33+
"code": "993781",
34+
"display": "Acetaminophen 300 MG / Codeine Phosphate 30 MG Oral Tablet"
35+
},
36+
{
37+
"system": "http://hl7.org/fhir/sid/ndc",
38+
"code": "00093015001"
39+
}
40+
],
41+
"text": "Acetaminophen 300 mg / Codeine 30 mg oral tablet"
42+
},
43+
"subject": {
44+
"reference": "Patient/pat017",
45+
"display": "Jon Snow"
46+
},
47+
"authoredOn": "2023-06-05",
48+
"requester": {
49+
"reference": "Practitioner/pra1234",
50+
"display": "Jane Doe"
51+
},
52+
"reasonCode": [
53+
{
54+
"text": "Post dental surgery"
55+
}
56+
],
57+
"dosageInstruction": [
58+
{
59+
"text": "1 tab tid prn pain"
60+
}
61+
],
62+
"dispenseRequest": {
63+
"numberOfRepeatsAllowed": 1,
64+
"quantity": {
65+
"value": 10,
66+
"unit": "each",
67+
"system": "http://unitsofmeasure.org",
68+
"code": "{each}"
69+
},
70+
"performer": {
71+
"identifier": {
72+
"system": "http://terminology.hl7.org/CodeSystem/NCPDPProviderIdentificationNumber",
73+
"value": "0999017"
74+
},
75+
"display": "Our Pharmacy"
76+
}
77+
}
78+
}

‎fhirResourcesToLoad/rems_snow_medicationrequest_addyi.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"resourceType": "MedicationRequest",
3+
"id": "pat017-mr-addyi",
4+
"medicationCodeableConcept": {
5+
"coding": [
6+
{
7+
"system": "http://www.nlm.nih.gov/research/umls/rxnorm",
8+
"code": "1666386",
9+
"display": "Addyi 100 MG Oral Tablet"
10+
},
11+
{
12+
"system": "http://hl7.org/fhir/sid/ndc",
13+
"code": "58604-214-03"
14+
}
15+
]
16+
},
17+
"status": "active",
18+
"intent": "order",
19+
"subject": {
20+
"reference": "Patient/pat017",
21+
"display": "Jon Snow"
22+
},
23+
"authoredOn": "2024-02-29",
24+
"requester": {
25+
"reference": "Practitioner/pra1234",
26+
"display": "Jane Doe"
27+
},
28+
"reasonCode": [
29+
{
30+
"coding": [
31+
{
32+
"system": "http://snomed.info/sct",
33+
"code": "270903007",
34+
"display": "Hypoactive sexual desire disorder (HSDD)"
35+
}
36+
]
37+
}
38+
],
39+
"insurance": [
40+
{
41+
"reference": "Coverage/cov017"
42+
}
43+
],
44+
"dosageInstruction": [
45+
{
46+
"sequence": 1,
47+
"text": "100mg before bed",
48+
"timing": {
49+
"repeat": {
50+
"frequency": 1,
51+
"period": 1,
52+
"periodUnit": "d"
53+
}
54+
},
55+
"route": {
56+
"coding": [
57+
{
58+
"system": "http://snomed.info/sct",
59+
"code": "26643006",
60+
"display": "Oral route (qualifier value)"
61+
}
62+
]
63+
},
64+
"doseAndRate": [
65+
{
66+
"type": {
67+
"coding": [
68+
{
69+
"system": "http://terminology.hl7.org/CodeSystem/dose-rate-type",
70+
"code": "ordered",
71+
"display": "Ordered"
72+
}
73+
]
74+
},
75+
"doseQuantity": {
76+
"value": 100,
77+
"unit": "mg",
78+
"system": "http://unitsofmeasure.org",
79+
"code": "mg"
80+
}
81+
}
82+
]
83+
}
84+
],
85+
"dispenseRequest": {
86+
"quantity": {
87+
"value": 28,
88+
"system": "http://terminology.hl7.org/CodeSystem/v3-orderableDrugForm",
89+
"code": "TAB"
90+
},
91+
"numberOfRepeatsAllowed": 2
92+
}
93+
}

‎fhirResourcesToLoad/rems_snow_medicationstatement_turalio.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"system": "http://snomed.info/sct",
3232
"code": "2183126",
33-
"display": "Product containing only turaliio"
33+
"display": "Product containing only turalio"
3434
}
3535
]
3636
},

‎src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ protected void initialize() throws ServletException {
224224
setPagingProvider(databaseBackedPagingProvider);
225225

226226
/*
227-
* This interceptor formats the output using nice colourful
227+
* This interceptor formats the output using nice colorful
228228
* HTML output when the request is detected to come from a
229229
* browser.
230230
*/
@@ -419,7 +419,7 @@ protected void initialize() throws ServletException {
419419
private ServerConformanceR4 createConformance(RestfulServer theRestfulServer, IFhirSystemDao<Bundle, Meta> theSystemDao, DaoConfig theDaoConfig, ISearchParamRegistry theSearchParamRegistry, IValidationSupport theValidationSupport){
420420
ServerConformanceR4 con = new ServerConformanceR4(theRestfulServer, theSystemDao,
421421
theDaoConfig, theSearchParamRegistry, theValidationSupport);
422-
// this isnt autowiring so force it.
422+
// this isn't autowiring so force it.
423423
myApplicationContext.getAutowireCapableBeanFactory().autowireBean(con);
424424
return con;
425425
}

‎src/main/java/ca/uhn/fhir/jpa/starter/JettyConfiguration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.eclipse.jetty.io.ByteBufferOutputStream;
1515
import org.eclipse.jetty.server.Dispatcher;
1616
import org.eclipse.jetty.server.Request;
17-
import org.eclipse.jetty.server.handler.AbstractHandler;
1817
import org.eclipse.jetty.server.handler.ErrorHandler;
1918
import org.eclipse.jetty.util.StringUtil;
2019

0 commit comments

Comments
 (0)