Fix tests for 2.3
This commit is contained in:
James
parent
295e9ec185
commit
d009e836bb
|
|
@ -40,6 +40,7 @@ import ca.uhn.fhir.jpa.search.IStaleSearchDeletingSvc;
|
|||
import ca.uhn.fhir.jpa.term.IHapiTerminologySvc;
|
||||
import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu3;
|
||||
import ca.uhn.fhir.parser.IParser;
|
||||
import ca.uhn.fhir.parser.StrictErrorHandler;
|
||||
import ca.uhn.fhir.rest.method.MethodUtil;
|
||||
import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
|
||||
import ca.uhn.fhir.util.TestUtil;
|
||||
|
|
@ -225,6 +226,7 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest {
|
|||
myDaoConfig.setHardSearchLimit(1000);
|
||||
myDaoConfig.setHardTagListLimit(1000);
|
||||
myDaoConfig.setIncludeLimit(2000);
|
||||
myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -2031,7 +2031,6 @@ public class FhirResourceDaoDstu3Test extends BaseJpaDstu3Test {
|
|||
" \"identifier\":[\n" +
|
||||
" {\n" +
|
||||
" \"use\":\"official\",\n" +
|
||||
" \"label\":\"HSP 2.16.840.1.113883.3.239.23.21\",\n" +
|
||||
" \"system\":\"urn:cgta:hsp_ids\",\n" +
|
||||
" \"value\":\"urn:oid:2.16.840.1.113883.3.239.23.21\"\n" +
|
||||
" }\n" +
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import ca.uhn.fhir.model.api.BundleEntry;
|
|||
import ca.uhn.fhir.model.dstu2.resource.Patient;
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
|
||||
import ca.uhn.fhir.parser.LenientErrorHandler;
|
||||
import ca.uhn.fhir.rest.client.IGenericClient;
|
||||
import ca.uhn.fhir.rest.client.ServerValidationModeEnum;
|
||||
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
|
|||
import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
|
||||
import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu3;
|
||||
import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
|
||||
import ca.uhn.fhir.parser.StrictErrorHandler;
|
||||
import ca.uhn.fhir.rest.client.IGenericClient;
|
||||
import ca.uhn.fhir.rest.client.ServerValidationModeEnum;
|
||||
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
|
||||
|
|
@ -68,7 +69,8 @@ public abstract class BaseResourceProviderDstu3Test extends BaseJpaDstu3Test {
|
|||
public void before() throws Exception {
|
||||
myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER);
|
||||
myFhirCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000);
|
||||
|
||||
myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
|
||||
|
||||
if (ourServer == null) {
|
||||
ourPort = RandomServerPortProvider.findFreePort();
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
|
|||
import ca.uhn.fhir.jpa.entity.TermConcept;
|
||||
import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink.RelationshipTypeEnum;
|
||||
import ca.uhn.fhir.jpa.term.IHapiTerminologySvc;
|
||||
import ca.uhn.fhir.parser.StrictErrorHandler;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
|
||||
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
|
||||
|
|
@ -348,7 +349,7 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
|
|||
|
||||
//@formatter:off
|
||||
try {
|
||||
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
|
||||
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-dstu3.xml");
|
||||
ourClient
|
||||
.operation()
|
||||
.onType(ValueSet.class)
|
||||
|
|
@ -364,7 +365,7 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
|
|||
|
||||
//@formatter:off
|
||||
try {
|
||||
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
|
||||
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-dstu3.xml");
|
||||
ourClient
|
||||
.operation()
|
||||
.onInstance(myExtensionalVsId)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Bundle xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hl7.org/fhir C:/VSTS/git/MedViewMapForce/Schema/fhir-single.xsd"
|
||||
xmlns="http://hl7.org/fhir">
|
||||
<Bundle xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://hl7.org/fhir">
|
||||
<id value="af89d63e90e34ec4b123c5fcc74b54e5" />
|
||||
<type value="transaction" />
|
||||
<entry>
|
||||
|
|
@ -38,7 +37,6 @@
|
|||
</identifier>
|
||||
<identifier>
|
||||
<use value="secondary" />
|
||||
<value value="" />
|
||||
<assigner>
|
||||
<display value="Entitlement" />
|
||||
</assigner>
|
||||
|
|
@ -107,21 +105,6 @@
|
|||
<manufacturer>
|
||||
<display value="PF" />
|
||||
</manufacturer>
|
||||
<product>
|
||||
<form>
|
||||
<text value="Ear drops" />
|
||||
</form>
|
||||
<ingredient>
|
||||
<item>
|
||||
<display value="Chloramphenicol" />
|
||||
</item>
|
||||
<amount>
|
||||
<extension url="http://erx.com.au/id/itemstrength">
|
||||
<valueString value="5 mg/mL" />
|
||||
</extension>
|
||||
</amount>
|
||||
</ingredient>
|
||||
</product>
|
||||
</Medication>
|
||||
</contained>
|
||||
<contained>
|
||||
|
|
@ -155,77 +138,6 @@
|
|||
</address>
|
||||
</Organization>
|
||||
</contained>
|
||||
<contained>
|
||||
<Practitioner>
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<xhtml:div>Ellison, Christine. HPI-I:8003616566689462</xhtml:div>
|
||||
</text>
|
||||
<identifier>
|
||||
<use value="secondary" />
|
||||
<system value="http://health.gov.au/health-id" />
|
||||
<value value="8003616566689462" />
|
||||
<assigner>
|
||||
<display value="HPI-I" />
|
||||
</assigner>
|
||||
</identifier>
|
||||
<identifier>
|
||||
<use value="secondary" />
|
||||
<type>
|
||||
<coding>
|
||||
<system value="http://hl7.org.au/v2/0203" />
|
||||
<code value="PRESC" />
|
||||
<display value="Prescriber Number" />
|
||||
</coding>
|
||||
<text value="Prescriber Number" />
|
||||
</type>
|
||||
<system value="http://ns.electronichealth.net.au/id/hi/presc" />
|
||||
<value value="1234567" />
|
||||
</identifier>
|
||||
<identifier>
|
||||
<use value="official" />
|
||||
<type>
|
||||
<coding>
|
||||
<system value="http://hl7.org.au/v2/0203" />
|
||||
<code value="PRN" />
|
||||
<display value="Provider Number" />
|
||||
</coding>
|
||||
<text value="Provider Number" />
|
||||
</type>
|
||||
<system value="http://ns.electronichealth.net.au/id/hi/prn" />
|
||||
<value value="22" />
|
||||
</identifier>
|
||||
<name>
|
||||
<use value="official" />
|
||||
<family value="Ellison" />
|
||||
<given value="Christine" />
|
||||
</name>
|
||||
<telecom>
|
||||
<system value="phone" />
|
||||
<value value="862126900" />
|
||||
<use value="work" />
|
||||
</telecom>
|
||||
<telecom>
|
||||
<system value="fax" />
|
||||
<value value="862126980" />
|
||||
<use value="work" />
|
||||
</telecom>
|
||||
<practitionerRole>
|
||||
<managingOrganization>
|
||||
<reference value="#eb5685fc5cc94b3282a7ecceb0ec59c5" />
|
||||
<display value="MILLENNIUM HEALTH SERVICE" />
|
||||
</managingOrganization>
|
||||
<role>
|
||||
<coding>
|
||||
<system value="http://hl7.org/fhir/ValueSet/anzsco-occupations" />
|
||||
<code value="253000" />
|
||||
<display value="Medical Practitioners nfd" />
|
||||
</coding>
|
||||
<text value="Medical Practitioners nfd" />
|
||||
</role>
|
||||
</practitionerRole>
|
||||
</Practitioner>
|
||||
</contained>
|
||||
<identifier>
|
||||
<use value="official" />
|
||||
<type>
|
||||
|
|
@ -247,28 +159,17 @@
|
|||
<system value="http://erx.com.au/id/DVAAuthority" />
|
||||
<value value="0:" />
|
||||
</identifier>
|
||||
<dateWritten value="2016-05-20T00:00:00" />
|
||||
<status value="active" />
|
||||
<patient>
|
||||
<subject>
|
||||
<reference value="urn:uuid:3E286BBC7F4D6C4BB951011E2F6B7C03" />
|
||||
<display value="JENKINS, Margurite" />
|
||||
</patient>
|
||||
<prescriber>
|
||||
<reference value="#20975244144243c0ae981bfce906e5ab" />
|
||||
<display value="Ellison, Christine" />
|
||||
</prescriber>
|
||||
<reasonCodeableConcept>
|
||||
<text value="" />
|
||||
</reasonCodeableConcept>
|
||||
</subject>
|
||||
<medicationReference>
|
||||
<reference value="#990f3dd481f3486d83ade87ce1f5e6ee" />
|
||||
<display value="Chloramphenicol" />
|
||||
</medicationReference>
|
||||
<dosageInstruction>
|
||||
<text value="one daily" />
|
||||
<route>
|
||||
<text value="" />
|
||||
</route>
|
||||
</dosageInstruction>
|
||||
<dispenseRequest>
|
||||
<numberOfRepeatsAllowed value="0" />
|
||||
|
|
@ -276,15 +177,6 @@
|
|||
<value value="1" />
|
||||
</quantity>
|
||||
</dispenseRequest>
|
||||
<substitution>
|
||||
<type>
|
||||
<coding>
|
||||
<system value="http://hl7.org/fhir/v3/substanceAdminSubstitution" />
|
||||
<code value="N" />
|
||||
<display value="none" />
|
||||
</coding>
|
||||
</type>
|
||||
</substitution>
|
||||
</MedicationRequest>
|
||||
</resource>
|
||||
<request>
|
||||
|
|
@ -387,20 +279,6 @@
|
|||
<family value="LENNON" />
|
||||
<given value="GEORGE" />
|
||||
</name>
|
||||
<practitionerRole>
|
||||
<managingOrganization>
|
||||
<reference value="urn:uuid:c6f81e7e4c844cb3a9e423edaf70e92b" />
|
||||
<display value="PCEHRCERT47" />
|
||||
</managingOrganization>
|
||||
<role>
|
||||
<coding>
|
||||
<system value="http://hl7.org/fhir/ValueSet/anzsco-occupations" />
|
||||
<code value="253000" />
|
||||
<display value="Pharmacists nfd" />
|
||||
</coding>
|
||||
<text value="Pharmacists nfd" />
|
||||
</role>
|
||||
</practitionerRole>
|
||||
</Practitioner>
|
||||
</resource>
|
||||
<request>
|
||||
|
|
@ -510,21 +388,6 @@
|
|||
<manufacturer>
|
||||
<display value="PF" />
|
||||
</manufacturer>
|
||||
<product>
|
||||
<form>
|
||||
<text value="EAR-DRP" />
|
||||
</form>
|
||||
<ingredient>
|
||||
<item>
|
||||
<display value="CHLORAMPHENICOL" />
|
||||
</item>
|
||||
<amount>
|
||||
<extension url="http://erx.com.au/id/itemstrength">
|
||||
<valueString value="0.5%" />
|
||||
</extension>
|
||||
</amount>
|
||||
</ingredient>
|
||||
</product>
|
||||
</Medication>
|
||||
</contained>
|
||||
<extension url="http://erx.com.au/id/SupplyNumber">
|
||||
|
|
@ -582,14 +445,6 @@
|
|||
<system value="http://erx.com.au/id/OriginalPharmacyApprovalNumber" />
|
||||
<value value="HN249M" />
|
||||
</identifier>
|
||||
<patient>
|
||||
<reference value="urn:uuid:3E286BBC7F4D6C4BB951011E2F6B7C03" />
|
||||
<display value="JENKINS, Margurite" />
|
||||
</patient>
|
||||
<dispenser>
|
||||
<reference value="urn:uuid:854b6f6e4398497ea91238a223310a2d" />
|
||||
<display value="LENNON, GEORGE" />
|
||||
</dispenser>
|
||||
<authorizingPrescription>
|
||||
<reference value="urn:uuid:902d418781be4fc185d9f45e523598f1" />
|
||||
<display value="1MN89XMN3B26M4B7P0-4" />
|
||||
|
|
|
|||
|
|
@ -346,17 +346,9 @@
|
|||
<date value="2015-08-03"/>
|
||||
<publisher value="FHIR Project team"/>
|
||||
<title value="Glasgow Coma Score"/>
|
||||
<concept>
|
||||
<system value="http://loinc.org"/>
|
||||
<code value="9269-2"/>
|
||||
</concept>
|
||||
<subjectType value="Patient"/>
|
||||
<item>
|
||||
<linkId value="1.1"/>
|
||||
<concept>
|
||||
<system value="http://loinc.org"/>
|
||||
<code value="9270-0"/>
|
||||
</concept>
|
||||
<type value="choice"/>
|
||||
<options>
|
||||
<reference value="#verbal"/>
|
||||
|
|
@ -364,10 +356,6 @@
|
|||
</item>
|
||||
<item>
|
||||
<linkId value="1.2"/>
|
||||
<concept>
|
||||
<system value="http://loinc.org"/>
|
||||
<code value="9268-4"/>
|
||||
</concept>
|
||||
<type value="choice"/>
|
||||
<options>
|
||||
<reference value="#motor"/>
|
||||
|
|
@ -375,10 +363,6 @@
|
|||
</item>
|
||||
<item>
|
||||
<linkId value="1.3"/>
|
||||
<concept>
|
||||
<system value="http://loinc.org"/>
|
||||
<code value="9267-6"/>
|
||||
</concept>
|
||||
<type value="choice"/>
|
||||
<options>
|
||||
<reference value="#eye"/>
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
"code": "IMP",
|
||||
"display": "Inpatient"
|
||||
},
|
||||
"patient": {
|
||||
"subject": {
|
||||
"reference": "urn:uuid:47521791-e0f9-4eb4-b65d-be4ec2b602bf"
|
||||
},
|
||||
"participant": [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
"compositional": false,
|
||||
"versionNeeded": false,
|
||||
"content": "complete",
|
||||
"concept": {
|
||||
"concept": [{
|
||||
"code": "work",
|
||||
"display": "Work",
|
||||
"definition": "An office address. First choice for business related contacts during business hours.",
|
||||
"designation": {
|
||||
"designation": [{
|
||||
"language": "IT",
|
||||
"value": "Lavoro"
|
||||
}
|
||||
}
|
||||
}]
|
||||
}]
|
||||
}
|
||||
|
|
@ -0,0 +1,124 @@
|
|||
<ValueSet xmlns="http://hl7.org/fhir">
|
||||
<id value="extensional-case-2" />
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">A selection of codes from http://loinc.org</div>
|
||||
</text>
|
||||
<url value="http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"/>
|
||||
<identifier>
|
||||
<value
|
||||
value="http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2" />
|
||||
</identifier>
|
||||
<name value="Terminology Services Connectation #1 Extensional case #2" />
|
||||
<publisher value="Grahame Grieve" />
|
||||
<contact>
|
||||
<telecom>
|
||||
<system value="email" />
|
||||
<value value="grahame@healthintersections.com.au" />
|
||||
</telecom>
|
||||
</contact>
|
||||
<description value="an enumeration of codes defined by LOINC" />
|
||||
<status value="draft" />
|
||||
<experimental value="true" />
|
||||
<compose>
|
||||
<include>
|
||||
<system value="http://loinc.org" />
|
||||
<concept>
|
||||
<code value="11378-7" />
|
||||
<display value="Systolic blood pressure at First encounter" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8493-9" />
|
||||
<display value="Systolic blood pressure 10 hour minimum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8494-7" />
|
||||
<display value="Systolic blood pressure 12 hour minimum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8495-4" />
|
||||
<display value="Systolic blood pressure 24 hour minimum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8451-7" />
|
||||
<display value="Systolic blood pressure--inspiration" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8452-5" />
|
||||
<display value="Systolic blood pressure.inspiration - expiration" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8459-0" />
|
||||
<display value="Systolic blood pressure--sitting" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8460-8" />
|
||||
<display value="Systolic blood pressure--standing" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8461-6" />
|
||||
<display value="Systolic blood pressure--supine" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8479-8" />
|
||||
<display value="Systolic blood pressure by palpation" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8480-6" />
|
||||
<display value="Systolic blood pressure" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8481-4" />
|
||||
<display value="Systolic blood pressure 1 hour maximum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8482-2" />
|
||||
<display value="Systolic blood pressure 8 hour maximum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8483-0" />
|
||||
<display value="Systolic blood pressure 10 hour maximum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8484-8" />
|
||||
<display value="Systolic blood pressure 12 hour maximum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8485-5" />
|
||||
<display value="Systolic blood pressure 24 hour maximum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8486-3" />
|
||||
<display value="Systolic blood pressure 1 hour mean" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8487-1" />
|
||||
<display value="Systolic blood pressure 8 hour mean" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8488-9" />
|
||||
<display value="Systolic blood pressure 10 hour mean" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8489-7" />
|
||||
<display value="Systolic blood pressure 12 hour mean" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8490-5" />
|
||||
<display value="Systolic blood pressure 24 hour mean" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8491-3" />
|
||||
<display value="Systolic blood pressure 1 hour minimum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8492-1" />
|
||||
<display value="Systolic blood pressure 8 hour minimum" />
|
||||
</concept>
|
||||
<concept>
|
||||
<code value="8450-9" />
|
||||
<display value="Systolic blood pressure--expiration" />
|
||||
</concept>
|
||||
</include>
|
||||
</compose>
|
||||
</ValueSet>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
"code": "IMP",
|
||||
"display": "Inpatient"
|
||||
},
|
||||
"patient": {
|
||||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"period": {
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"occurrenceDateTime": "2011-12-01T09:49:12-05:00",
|
||||
"requester": {
|
||||
"performer": {
|
||||
"reference": "#1"
|
||||
}
|
||||
},
|
||||
|
|
@ -209,11 +209,11 @@
|
|||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"encounter": {
|
||||
"context": {
|
||||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"effectiveDateTime": "2011-11-23T00:00:00-05:00",
|
||||
"request": [
|
||||
"basedOn": [
|
||||
{
|
||||
"reference": "urn:uuid:3b3f2d52-2153-44ac-b6b9-d1153db04561"
|
||||
}
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"encounter": {
|
||||
"context": {
|
||||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"effectiveDateTime": "2011-12-01T09:49:00-05:00",
|
||||
|
|
@ -289,7 +289,7 @@
|
|||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"encounter": {
|
||||
"context": {
|
||||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"effectiveDateTime": "2011-12-01T09:49:00-05:00",
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"encounter": {
|
||||
"context": {
|
||||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"effectiveDateTime": "2011-12-01T09:49:00-05:00",
|
||||
|
|
@ -345,7 +345,7 @@
|
|||
"subject": {
|
||||
"reference": "urn:uuid:09a8d22c-1e23-4e5f-b3bf-505772f123d1"
|
||||
},
|
||||
"encounter": {
|
||||
"context": {
|
||||
"reference": "urn:uuid:29e3a213-0df4-41e0-88f8-e3be83277022"
|
||||
},
|
||||
"effectiveDateTime": "2011-12-01T10:57:00-05:00",
|
||||
|
|
|
|||
|
|
@ -10,13 +10,6 @@
|
|||
"status": "draft",
|
||||
"experimental": true,
|
||||
"description": "Base StructureDefinition for Basic Resource",
|
||||
"requirements": "Need some way to safely (without breaking interoperability) allow implementers to exchange content not supported by the initial set of declared resources.",
|
||||
"code": [
|
||||
{
|
||||
"system": "http://fhir.hl7.org.nz/NamingSystem/application",
|
||||
"code": "clinfhir"
|
||||
}
|
||||
],
|
||||
"kind": "resource",
|
||||
"abstract": false,
|
||||
"baseDefinition": "http://hl7.org/fhir/StructureDefinition/Basic",
|
||||
|
|
@ -126,8 +119,6 @@
|
|||
"path": "Basic.code",
|
||||
"short": "Kind of Resource",
|
||||
"definition": "Identifies the 'type' of resource - equivalent to the resource name for other resources.",
|
||||
"comments": "Because resource references will only be able to indicate 'Basic', the type of reference will need to be specified in a Profile identified as part of the resource. Refer to the resource notes section for information on appropriate terminologies for this code.",
|
||||
"requirements": "Must be able to distinguish different types of \"basic\" resources.",
|
||||
"min": 1,
|
||||
"max": "1",
|
||||
"type": [
|
||||
|
|
@ -159,8 +150,6 @@
|
|||
"path": "Basic.subject",
|
||||
"short": "Identifies the focus of this resource",
|
||||
"definition": "Identifies the patient, practitioner, device or any other resource that is the \"focus\" of this resource.",
|
||||
"comments": "Optional as not all resources potential resources will have subjects. Resources associated with multiple subjects can handle this via extension.",
|
||||
"requirements": "Needed for partitioning the resource by Patient.",
|
||||
"min": 0,
|
||||
"max": "1",
|
||||
"type": [
|
||||
|
|
@ -185,7 +174,6 @@
|
|||
"path": "Basic.created",
|
||||
"short": "When created",
|
||||
"definition": "Identifies when the resource was first created.",
|
||||
"requirements": "Allows ordering resource instances by time.",
|
||||
"min": 0,
|
||||
"max": "1",
|
||||
"type": [
|
||||
|
|
@ -209,7 +197,6 @@
|
|||
"path": "Basic.author",
|
||||
"short": "Who created",
|
||||
"definition": "Indicates who was responsible for creating the resource instance.",
|
||||
"requirements": "Needed for partitioning the resource.",
|
||||
"min": 0,
|
||||
"max": "1",
|
||||
"type": [
|
||||
|
|
|
|||
|
|
@ -20,15 +20,14 @@
|
|||
<reference value="Patient?identifier=http://www.ghh.org/identifiers|condreftestpatid1" />
|
||||
<display value="Kennedy, Ann(*24.05.1928)" />
|
||||
</patient>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1605" />
|
||||
<display value="L" />
|
||||
</coding>
|
||||
<text value="acetaminophen" />
|
||||
</substance>
|
||||
<category value="medication" />
|
||||
<reaction>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1605" />
|
||||
<display value="L" />
|
||||
</coding>
|
||||
<text value="acetaminophen" />
|
||||
</substance>
|
||||
<manifestation>
|
||||
<text value="Muscle Pain" />
|
||||
</manifestation>
|
||||
|
|
@ -72,15 +71,14 @@
|
|||
<reference value="Patient?identifier=http://www.ghh.org/identifiers|condreftestpatid1" />
|
||||
<display value="Kennedy, Ann(*24.05.1928)" />
|
||||
</patient>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="2221" />
|
||||
<display value="L" />
|
||||
</coding>
|
||||
<text value="Peanuts" />
|
||||
</substance>
|
||||
<category value="environment" />
|
||||
<reaction>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="2221" />
|
||||
<display value="L" />
|
||||
</coding>
|
||||
<text value="Peanuts" />
|
||||
</substance>
|
||||
<manifestation>
|
||||
<text value="Anaphylactic Shock" />
|
||||
</manifestation>
|
||||
|
|
|
|||
|
|
@ -100,11 +100,10 @@
|
|||
</assigner>
|
||||
</identifier>
|
||||
<status value="in-progress"/>
|
||||
<class value="inpatient"/>
|
||||
<patient>
|
||||
<subject>
|
||||
<reference value="urn:uuid:87c8e948-e0d2-4b92-74bd-a824a4769ab4"/>
|
||||
<display value="Connectathon, Ten(*24.05.2015)"/>
|
||||
</patient>
|
||||
</subject>
|
||||
<period>
|
||||
<start value="2015-05-02T09:00:00+01:00"/>
|
||||
</period>
|
||||
|
|
@ -135,15 +134,14 @@
|
|||
<reference value="urn:uuid:87c8e948-e0d2-4b92-74bd-a824a4769ab4"/>
|
||||
<display value="Connectathon, Ten(*24.05.2015)"/>
|
||||
</patient>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1605"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="acetaminophen"/>
|
||||
</substance>
|
||||
<category value="medication"/>
|
||||
<reaction>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1605"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="acetaminophen"/>
|
||||
</substance>
|
||||
<manifestation>
|
||||
<text value="Muscle Pain"/>
|
||||
</manifestation>
|
||||
|
|
@ -176,15 +174,14 @@
|
|||
<reference value="urn:uuid:87c8e948-e0d2-4b92-74bd-a824a4769ab4"/>
|
||||
<display value="Connectathon, Ten(*24.05.2015)"/>
|
||||
</patient>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1558"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="Oxycodone"/>
|
||||
</substance>
|
||||
<category value="medication"/>
|
||||
<reaction>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="1558"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="Oxycodone"/>
|
||||
</substance>
|
||||
<manifestation>
|
||||
<text value="Muscle Pain"/>
|
||||
</manifestation>
|
||||
|
|
@ -217,15 +214,14 @@
|
|||
<reference value="urn:uuid:87c8e948-e0d2-4b92-74bd-a824a4769ab4"/>
|
||||
<display value="Connectathon, Ten(*24.05.2015)"/>
|
||||
</patient>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="2221"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="Peanuts"/>
|
||||
</substance>
|
||||
<category value="environment"/>
|
||||
<reaction>
|
||||
<substance>
|
||||
<coding>
|
||||
<code value="2221"/>
|
||||
<display value="L"/>
|
||||
</coding>
|
||||
<text value="Peanuts"/>
|
||||
</substance>
|
||||
<manifestation>
|
||||
<text value="Anaphylactic Shock "/>
|
||||
</manifestation>
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@
|
|||
<item name="Tags" href="./doc_tags.html" />
|
||||
<item name="Validation" href="./doc_validation.html" />
|
||||
<item name="Custom Structures" href="./doc_custom_structures.html" />
|
||||
<item name="Version Converter" href="./doc_converter.html" />
|
||||
</item>
|
||||
<item name="RESTful Client" href="./doc_rest_client.html" >
|
||||
<item name="Fluent/Generic Client" href="./doc_rest_client.html" />
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
</p>
|
||||
<macro name="snippet">
|
||||
<param name="id" value="1020"/>
|
||||
<param name="file" value="examples/src/main/java/example/ConverterExample.java"/>
|
||||
<param name="file" value="examples/src/main/java/example/ConverterExamples.java"/>
|
||||
</macro>
|
||||
</subsection>
|
||||
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
</p>
|
||||
<macro name="snippet">
|
||||
<param name="id" value="1420"/>
|
||||
<param name="file" value="examples/src/main/java/example/ConverterExample.java"/>
|
||||
<param name="file" value="examples/src/main/java/example/ConverterExamples.java"/>
|
||||
</macro>
|
||||
</subsection>
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<li><a href="./doc_tags.html">Tags</a></li>
|
||||
<li><a href="./doc_validation.html">Validation</a></li>
|
||||
<li><a href="./doc_custom_structures.html">Custom Structures</a></li>
|
||||
<li><a href="./doc_converter.html">Version Converter</a></li>
|
||||
</ul>
|
||||
|
||||
<h4>RESTful Client</h4>
|
||||
|
|
|
|||
|
|
@ -78,11 +78,17 @@
|
|||
This release brings the STU3 definitions up to the
|
||||
latest definitions (FHIR 1.9.0 - SVN 11501). It also brings
|
||||
in the latest validator fixes, as well as a number of other
|
||||
useful enhancements and fixes.
|
||||
useful enhancements and fixes, including:
|
||||
</p>
|
||||
<ul>
|
||||
<li>A new experimental module for <a href="./doc_converter.html">converting from DSTU2/2.1 structures to STU3 structures</a></li>
|
||||
<li>Support in the JPA server for <a href="https://smilecdr.com/blog/20170208_custom_search_parameters">custom search parameters</a> (STU3 only for now)</li>
|
||||
<li>Many other performance fixes, enhancements, and bugfixes</li>
|
||||
</ul>
|
||||
<p>
|
||||
As always, the <a href="./changes-report.html">changelog</a> has the full list
|
||||
of changes in this release.
|
||||
of changes in this release. Thanks to everyone who contributed to this release, either
|
||||
by submitting pull requests, suggesting new features, or filing bug requests!
|
||||
</p>
|
||||
<p>
|
||||
- <a href="https://github.com/jamesagnew/">James Agnew</a>
|
||||
|
|
@ -115,7 +121,8 @@
|
|||
- <a href="https://github.com/jamesagnew/">James Agnew</a>
|
||||
</p>
|
||||
<br/><br/>
|
||||
|
||||
|
||||
<!--
|
||||
<p>
|
||||
<b>November 11, 2016 - HAPI FHIR 2.1 Released</b> -
|
||||
The next release of HAPI has now been uploaded to the Maven repos and
|
||||
|
|
@ -162,9 +169,6 @@
|
|||
</p>
|
||||
<br/><br/>
|
||||
|
||||
|
||||
|
||||
<!--
|
||||
<p>
|
||||
<b>August 30, 2016 - HAPI FHIR 2.0 Released</b> -
|
||||
The next release of HAPI has now been uploaded to the Maven repos and
|
||||
|
|
|
|||
Loading…
Reference in New Issue