Merge pull request #23 from fhirbase/master

merge fhirbase with upstream
KainosSoftwareLtd · Oct 13, 2016 · 2599c90 · 2599c90
2 parents 8ae2f91 + c73098b
commit 2599c90
Show file tree

Hide file tree

Showing 39 changed files with 329,903 additions and 356,504 deletions.
diff --git a/.projectile b/.projectile
diff --git a/README.md b/README.md
@@ -171,7 +171,7 @@ SELECT fhir_create_resource('{"resource": {"resourceType": "Patient", "name": [{
 SELECT fhir_create_resource('{"allowId": true, "resource": {"resourceType": "Patient", "id": "smith"}}');
 
 -- conditional create
-SELECT fhir_create_resource('{"ifNotExist": "identifier=007", "resource": {"resourceType": "Patient", "id": "smith", "name": [{"given": ["Smith"]}]}}');
+SELECT fhir_create_resource('{"ifNoneExist": "identifier=007", "resource": {"resourceType": "Patient", "id": "smith", "name": [{"given": ["Smith"]}]}}');
 
 SELECT fhir_read_resource('{"resourceType": "Patient", "id": "smith"}');
 
@@ -239,3 +239,4 @@ See the [CONTRIBUTING.md][].
 Copyright © 2016 health samurai.
 
 fhirbase is released under the terms of the MIT License.
+
diff --git a/fhir/conceptmaps.json b/fhir/conceptmaps.json
diff --git a/fhir/profiles-resources.json b/fhir/profiles-resources.json
diff --git a/fhir/profiles-types.json b/fhir/profiles-types.json