diff --git a/examples/src/main/java/example/RestfulPatientResourceProviderMore.java b/examples/src/main/java/example/RestfulPatientResourceProviderMore.java index e13875883b6..81cdb182776 100644 --- a/examples/src/main/java/example/RestfulPatientResourceProviderMore.java +++ b/examples/src/main/java/example/RestfulPatientResourceProviderMore.java @@ -297,7 +297,7 @@ public Patient getResourceById(@IdParam IdDt theId) { Patient retVal = new Patient(); // ...populate... - retVal.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345"); + retVal.addIdentifier().setSystem("urn:mrns").setValue("12345"); retVal.addName().addFamily("Smith").addGiven("Tester").addGiven("Q"); // ...etc... @@ -389,7 +389,7 @@ public List searchByLastName(@RequiredParam(name=Patient.SP_FAMILY) Str // ...populate... Patient patient = new Patient(); - patient.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345"); + patient.addIdentifier().setSystem("urn:mrns").setValue("12345"); patient.addName().addFamily("Smith").addGiven("Tester").addGiven("Q"); // ...etc... diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderMultiVersionTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderMultiVersionTest.java index 9af8eeb58e2..3c8144fcd03 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderMultiVersionTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderMultiVersionTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.provider; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.List; @@ -17,7 +17,7 @@ import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu2.resource.SupportingDocumentation; +import ca.uhn.fhir.model.dstu2.resource.PaymentNotice; import ca.uhn.fhir.model.dstu2.valueset.AdministrativeGenderEnum; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.StringDt; @@ -105,12 +105,12 @@ public class ResourceProviderMultiVersionTest { p.addIdentifier().setSystem("urn:MultiFhirVersionTest").setValue("testUnknownResourceType01"); IdDt id = ourClientDstu2.create().resource(p).execute().getId(); - SupportingDocumentation s = new SupportingDocumentation(); + PaymentNotice s = new PaymentNotice(); s.addIdentifier().setSystem("urn:MultiFhirVersionTest").setValue("testUnknownResourceType02"); id = ourClientDstu2.create().resource(s).execute().getId(); Bundle history = ourClientDstu2.history(null, id, null, null); - assertEquals(SupportingDocumentation.class, history.getEntries().get(0).getResource().getClass()); + assertEquals(PaymentNotice.class, history.getEntries().get(0).getResource().getClass()); assertEquals(ca.uhn.fhir.model.dstu2.resource.Patient.class, history.getEntries().get(1).getResource().getClass()); history = ourClientDstu1.history(null, id, null, null); diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 8039779f821..242553ea6f1 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -227,7 +227,6 @@ Observation AllergyIntolerance ExplanationOfBenefit - SupportingDocumentation RelatedPerson AuditEvent EligibilityResponse diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-invariants.sch b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-invariants.sch index 341129bee7a..4ac94009129 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-invariants.sch +++ b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-invariants.sch @@ -7555,83 +7555,6 @@ per-1: If present, start SHALL have a lower value than end - - SupportingDocumentation - - cod-1: If a valueSet is provided, a system URI Is required - - - cod-1: If a valueSet is provided, a system URI Is required - - - dom-2: If the resource is contained in another resource, it SHALL not contain nested Resources - dom-1: If the resource is contained in another resource, it SHALL not contain any narrative - dom-4: If a resource is contained in another resource, it SHALL not have a meta.versionId or a meta.lastUpdated - dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - - cod-1: If a valueSet is provided, a system URI Is required - - - cod-1: If a valueSet is provided, a system URI Is required - - - cod-1: If a valueSet is provided, a system URI Is required - - - cod-1: If a valueSet is provided, a system URI Is required - - - ccc-2: Only one coding in a set can be chosen directly by the user - - - cod-1: If a valueSet is provided, a system URI Is required - - - per-1: If present, start SHALL have a lower value than end - - - ref-1: SHALL have a local reference if the resource is provided inline - - - cod-1: If a valueSet is provided, a system URI Is required - - - cod-1: If a valueSet is provided, a system URI Is required - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - ref-1: SHALL have a local reference if the resource is provided inline - - - att-1: It the Attachment has data, it SHALL have a contentType - - ClinicalImpression diff --git a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd index 7b15330ae5b..10edff90fca 100644 --- a/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd +++ b/hapi-fhir-structures-dstu2/src/main/resources/ca/uhn/fhir/model/dstu2/schema/fhir-single.xsd @@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE. - Generated on Tue, Mar 31, 2015 09:45-0400 for FHIR v0.4.0 + Generated on Thu, Apr 2, 2015 10:47-0400 for FHIR v0.5.0 --> - + @@ -210,7 +210,6 @@ - @@ -259,7 +258,6 @@ - @@ -377,7 +375,6 @@ - @@ -1766,12 +1763,12 @@ P.O. Box number, delivery hints, and similar address information. - Comments about the use of the element, including notes about how to use the data properly, exceptions to proper use, etc. + Explanatory notes and implementation guidance about the data element, including notes about how to use the data properly, exceptions to proper use, etc. - Explains why this element is needed and why it's been constrained as it has. + This element is for traceability of why the element was created and why the constraints exist as they do. This may be used to point to source materials or specifications that drove the structure of this element. @@ -3664,7 +3661,7 @@ P.O. Box number, delivery hints, and similar address information. - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -3752,11 +3749,6 @@ P.O. Box number, delivery hints, and similar address information.A supply - a request for something, and provision of what is supplied. - - - This resource provides the supporting information for a process, for example clinical or financial information related to a claim or pre-authorization. - - A value set specifies a set of codes drawn from one or more code systems. @@ -4324,7 +4316,7 @@ P.O. Box number, delivery hints, and similar address information. - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -4412,11 +4404,6 @@ P.O. Box number, delivery hints, and similar address information.A supply - a request for something, and provision of what is supplied. - - - This resource provides the supporting information for a process, for example clinical or financial information related to a claim or pre-authorization. - - A value set specifies a set of codes drawn from one or more code systems. @@ -4540,7 +4527,7 @@ P.O. Box number, delivery hints, and similar address information. - Indicates who has responsibility for the record. + Individual who recorded the record and takes responsibility for its conten. @@ -18680,12 +18667,12 @@ other observer (for example a relative or EMT), or any observation made about th - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. If the element is present, it must have either a @value, an @id, or extensions @@ -18794,7 +18781,7 @@ other observer (for example a relative or EMT), or any observation made about th - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -18812,7 +18799,7 @@ other observer (for example a relative or EMT), or any observation made about th - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -18833,7 +18820,7 @@ other observer (for example a relative or EMT), or any observation made about th - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -18854,7 +18841,7 @@ other observer (for example a relative or EMT), or any observation made about th - An action that is performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. + An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -20807,7 +20794,7 @@ other observer (for example a relative or EMT), or any observation made about th - The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.4.0 for this version. + The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version. @@ -21433,111 +21420,6 @@ other observer (for example a relative or EMT), or any observation made about th - - - This resource provides the supporting information for a process, for example clinical or financial information related to a claim or pre-authorization. - - - - - This resource provides the supporting information for a process, for example clinical or financial information related to a claim or pre-authorization. - If the element is present, it must have either a @value, an @id, or extensions - - - - - - - The Response Business Identifier. - - - - - The version of the style of resource contents. This should be mapped to the allowable profiles for this and supporting resources. - - - - - The style (standard) and version of the original material which was converted into this resource. - - - - - The date when this resource was created. - - - - - The Insurer, organization or Provider who is target of the submission. - - - - - The practitioner who is responsible for the services rendered to the patient. - - - - - The organization which is responsible for the services rendered to the patient. - - - - - Original request. - - - - - Original response. - - - - - Person who created the submission. - - - - - The patient who is directly or indirectly the subject of the supporting information. - - - - - Supporting Files. - - - - - - - - - This resource provides the supporting information for a process, for example clinical or financial information related to a claim or pre-authorization. - - - - - - - A link Id for the response to reference. - - - - - The attached content. - - - - - - - The date and optionally time when the material was created. - - - - - - A value set specifies a set of codes drawn from one or more code systems. diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu2/elementdefinition.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu2/elementdefinition.xml index 449d140d5a1..76d30f0ab9e 100644 --- a/hapi-tinder-plugin/src/main/resources/dt/dstu2/elementdefinition.xml +++ b/hapi-tinder-plugin/src/main/resources/dt/dstu2/elementdefinition.xml @@ -10,7 +10,7 @@ Grahame 2012-03-19T11:12:07Z 2015-03-08T05:31:13Z - 14.00 + 12.00 @@ -20,7 +20,7 @@ 10620 15240 150 - 2 + 1 False False @@ -1441,7 +1441,7 @@ - + ElementDefinition.comments @@ -1459,7 +1459,7 @@ Comments about the use of this element - Comments about the use of the element, including notes about how to use the data properly, exceptions to proper use, etc.Explanatory notes and implementation guidance about the data element, including notes about how to use the data properly, exceptions to proper use, etc. If it is possible to capture usage rules using invariants, that mechanism should be used in preference to this element Why is this needed? - Explains why this element is needed and why it's been constrained as it hasThis element is for traceability of why the element was created and why the constraints exist as they do. This may be used to point to source materials or specifications that drove the structure of this element. This element does not describe the usage of the element (that's done in comments), rather it's for traceability of *why* the element is either needed or why the constraints exist as they do. This may be used to point to source materials or specifications that drove the structure of this data element600 600 + 1 - 40 + 14 1 - 1 + 11 0 @@ -4298,6 +4299,7 @@ 1 + 1 2 @@ -4305,8 +4307,7 @@ 0 - 46 - 7 + 13 False @@ -5009,7 +5010,6 @@ 600 600 - 1 @@ -5029,8 +5029,8 @@ 0 - 12 - 6 + 5 + 3 False diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/allergyintolerance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/allergyintolerance-spreadsheet.xml index 557e7d27080..f88a40f7897 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/allergyintolerance-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/allergyintolerance-spreadsheet.xml @@ -10,7 +10,7 @@ Grahame 2012-03-19T11:12:07Z 2015-03-21T19:33:55Z - 14.00 + 12.00 @@ -1058,7 +1058,7 @@ - + AllergyIntolerance.recorder Author Who recorded the sensitivity - Indicates who has responsibility for the recordIndividual who recorded the record and takes responsibility for its conten @@ -3756,7 +3756,7 @@ 1 - 7 + 1 1 1 0 @@ -3769,12 +3769,11 @@ 2 - 1 0 - 9 - 13 + 6 + 14 False diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/bundle-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/bundle-spreadsheet.xml index 204206b0050..15b8f32c385 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/bundle-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/bundle-spreadsheet.xml @@ -1440,7 +1440,7 @@ - rightleft @@ -1652,7 +1652,7 @@ - rightleft @@ -3828,9 +3828,9 @@ 1 - 15 + 10 1 - 1 + 14 0 @@ -3838,6 +3838,7 @@ 1 + 1 2 @@ -3845,8 +3846,8 @@ 0 - 24 - 4 + 18 + 20 False diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/careplan-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/careplan-spreadsheet.xml index 11dbbc21e48..e5f52ebaab7 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/careplan-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/careplan-spreadsheet.xml @@ -20,7 +20,7 @@ 23040 0 0 - 6 + 1 False False @@ -979,7 +979,7 @@ ss:Name="_FilterDatabase"/> - 220;00,0 At present, this resource combines the concepts of CarePlan and CareTeam. Should they be split?REL (REL.4 is always the Patient) ( or PRT?) - 20;1800;260 @@ -1422,8 +1422,7 @@ GOL.1 - 0;0 + Should this be expanded into code + value + timeframe? @@ -1455,7 +1454,7 @@ ss:Name="_FilterDatabase"/> - 440;0250;0 @@ -1587,7 +1586,7 @@ ss:Name="_FilterDatabase"/> - 700;0250;250 @@ -3756,12 +3755,13 @@ 600 600 + 1 - 18 + 13 1 - 1 + 14 0 @@ -3769,6 +3769,7 @@ 1 + 1 2 @@ -3776,8 +3777,8 @@ 0 - 19 - 3 + 20 + 20 False @@ -6259,7 +6260,6 @@ - 1 diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/claim-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/claim-spreadsheet.xml index 9c98ef153ba..97ea86cf9d5 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/claim-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/claim-spreadsheet.xml @@ -292,7 +292,7 @@ - - + - + - + - + - - - + - - + - - - - + - + - - - + - - - - - + + - - - - - @@ -1126,7 +1126,8 @@ ss:Name="_FilterDatabase"/> - + 220;0 @@ -1476,7 +1477,8 @@ - + 530;-20 @@ -1568,7 +1570,8 @@ ss:Name="_FilterDatabase"/> - + 530;80 @@ -1857,7 +1860,7 @@ - left530;260 @@ -1979,7 +1982,7 @@ - left250;300 @@ -2257,7 +2260,7 @@ - down-20;320 @@ -2380,7 +2383,7 @@ ss:Name="_FilterDatabase"/> - down-20;460 @@ -2752,7 +2755,7 @@ - down-20;0 @@ -2843,7 +2846,7 @@ - down-20;120 @@ -2934,7 +2937,7 @@ - down-20;230 @@ -4687,12 +4690,13 @@ 600 600 + 1 - 52 + 35 1 - 1 + 13 0 @@ -4700,6 +4704,7 @@ 1 + 1 2 @@ -4707,8 +4712,8 @@ 0 - 53 - 0 + 42 + 20 False @@ -8229,7 +8234,7 @@ ss:Author=""> How is the set of codes defined? - ConformanceConformance Reference - ContractType + ContractType List of overall contract codes value set example @@ -8284,7 +8289,7 @@ - ContractSubtype + ContractSubtype Detailed codes within the above value set example @@ -8299,7 +8304,7 @@ - ContractTermType + ContractTermType Detailed codes for the types of contract provisions value set example @@ -8314,7 +8319,7 @@ - ContractTermSubType + ContractTermSubType Detailed codes for the subtypes of contract provisions value set example @@ -8329,7 +8334,7 @@ - ContractSignerType + ContractSignerType List of parties who may be signing value set preferred @@ -8363,7 +8368,7 @@ Detailed codes for the contract action reason value set example - http://hl7.org/fhir/v3/vs/PurposeOfUse @@ -8391,7 +8396,7 @@ - + @@ -8405,7 +8410,7 @@ - + @@ -8419,7 +8424,7 @@ - + @@ -8433,7 +8438,7 @@ - + @@ -8447,7 +8452,7 @@ - + @@ -8461,7 +8466,7 @@ - + @@ -8475,7 +8480,7 @@ - + @@ -8489,7 +8494,7 @@ - + @@ -8503,7 +8508,7 @@ - + @@ -8517,7 +8522,7 @@ - + @@ -8531,7 +8536,7 @@ - + @@ -8545,7 +8550,7 @@ - + @@ -8559,7 +8564,7 @@ - + @@ -8573,7 +8578,7 @@ - + @@ -8587,7 +8592,7 @@ - + @@ -8601,7 +8606,7 @@ - + @@ -8615,7 +8620,7 @@ - + @@ -8629,7 +8634,7 @@ - + @@ -8643,7 +8648,7 @@ - + @@ -8657,7 +8662,7 @@ - + @@ -8671,7 +8676,7 @@ - + @@ -8698,7 +8703,6 @@ 600 600 - 1 @@ -8742,7 +8746,7 @@ xmlns="urn:schemas-microsoft-com:office:excel"> - R2C1:R6C3,R10C1:R30C3,R7C2:R9C3,R2C5:R30C13 + R2C1:R6C3,R10C1:R30C3,R7C2:R9C3,R2C5:R30C13,R8C15 AND(RC1="",RC<>"") @@ -8763,7 +8767,7 @@ - R2C5:R30C5 + R2C5:R30C5,R8C15 AND(RC1<>"",(RC3="unbound")<>(RC="")) @@ -8784,7 +8788,7 @@ - R2C1:R30C3,R2C5:R30C13 + R2C1:R30C3,R2C5:R30C13,R8C15 LEFT(RC1,1)="!" @@ -8797,27 +8801,6 @@ - - R8C15 - - AND(RC1="",RC<>"") - - - - - R8C15 - - AND(RC1<>"",(RC3="unbound")<>(RC="")) - - - - - R8C15 - - LEFT(RC1,1)="!" - - - @@ -8875,9 +8858,9 @@ - - - + + + @@ -8886,9 +8869,9 @@ - - - + + + @@ -8897,9 +8880,9 @@ - - - + + + @@ -8908,9 +8891,9 @@ - - - + + + @@ -8919,9 +8902,9 @@ - - - + + + @@ -8930,9 +8913,9 @@ - - - + + + @@ -8941,9 +8924,9 @@ - - - + + + @@ -8952,9 +8935,9 @@ - - - + + + @@ -8963,9 +8946,9 @@ - - - + + + @@ -8974,9 +8957,9 @@ - - - + + + @@ -8985,9 +8968,9 @@ - - - + + + @@ -8996,9 +8979,9 @@ - - - + + + @@ -9007,9 +8990,9 @@ - - - + + + @@ -9018,9 +9001,9 @@ - - - + + + @@ -9029,9 +9012,9 @@ - - - + + + @@ -9040,9 +9023,9 @@ - - - + + + @@ -9051,9 +9034,9 @@ - - - + + + @@ -9062,9 +9045,9 @@ - - - + + + @@ -9073,9 +9056,9 @@ - - - + + + @@ -9084,9 +9067,9 @@ - - - + + + @@ -9095,9 +9078,9 @@ - - - + + + @@ -9106,9 +9089,9 @@ - - - + + + @@ -9117,9 +9100,9 @@ - - - + + + @@ -9128,9 +9111,9 @@ - - - + + + @@ -9139,9 +9122,9 @@ - - - + + + @@ -9150,9 +9133,9 @@ - - - + + + @@ -9161,9 +9144,9 @@ - - - + + + @@ -9172,9 +9155,9 @@ - - - + + + @@ -9183,9 +9166,9 @@ - - - + + + @@ -9194,9 +9177,9 @@ - - - + + + @@ -9205,9 +9188,9 @@ - - - + + + @@ -9216,9 +9199,9 @@ - - - + + + @@ -9227,9 +9210,9 @@ - - - + + + @@ -9238,9 +9221,9 @@ - - - + + + @@ -9249,9 +9232,9 @@ - - - + + + @@ -9260,9 +9243,9 @@ - - - + + + @@ -9271,9 +9254,9 @@ - - - + + + @@ -9282,9 +9265,9 @@ - - - + + + @@ -9293,9 +9276,9 @@ - - - + + + @@ -9304,9 +9287,9 @@ - - - + + + @@ -9315,9 +9298,9 @@ - - - + + + @@ -9326,9 +9309,9 @@ - - - + + + @@ -9337,9 +9320,9 @@ - - - + + + @@ -9348,9 +9331,9 @@ - - - + + + @@ -9359,9 +9342,9 @@ - - - + + + @@ -9370,9 +9353,9 @@ - - - + + + @@ -9381,9 +9364,9 @@ - - - + + + @@ -9392,9 +9375,9 @@ - - - + + + @@ -9403,9 +9386,9 @@ - - - + + + diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/dataelement-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/dataelement-spreadsheet.xml index 7928d33f6d0..01373b05cb0 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/dataelement-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/dataelement-spreadsheet.xml @@ -1442,7 +1442,8 @@ ss:Name="_FilterDatabase"/> - + right @@ -1590,7 +1591,8 @@ 100;0 - + right @@ -3820,9 +3822,9 @@ 1 - 2 + 13 1 - 4 + 15 0 @@ -3838,8 +3840,8 @@ 0 - 19 - 14 + 15 + 24 False diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/documentmanifest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/documentmanifest-spreadsheet.xml index 48bbb0e9b4b..cc91636b825 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/documentmanifest-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/documentmanifest-spreadsheet.xml @@ -295,11 +295,8 @@ - - + - + - + - + - + - - - + - - + - - - - + - + - - - @@ -1139,7 +1139,7 @@ ss:Name="_FilterDatabase"/> - DocumentC80TypeDocumentC80Type class @@ -1433,7 +1433,8 @@ - + right @@ -1497,7 +1498,8 @@ - + right @@ -3672,30 +3674,30 @@ - - - - - - - - - - - - - - + + + + + + + + + + + - + - + + + + @@ -3714,9 +3716,9 @@ 1 - 1 + 9 1 - 8 + 15 0 @@ -3728,11 +3730,12 @@ 2 + 1 0 - 6 - 14 + 14 + 21 False @@ -3916,484 +3919,484 @@ ss:Hidden="1"/> - - - - - - + x:FullRows="1" ss:StyleID="s101" ss:DefaultRowHeight="15"> + + + + + + - IdId Unique Number - NameName Unique short label - SeveritySeverity Indicates impact of violating the invariant. (Defaults to 'error') - ContextContext Element path at which check should occur. E.g. ResourceName.element1.element2 - EnglishEnglish English description of constraint - OCLOCL Optional - OCL expression of the rule - XPathXPath XPath 2 expression. See wiki or make Lloyd do it :> - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + +
@@ -4482,221 +4485,221 @@ ss:Hidden="1"/> - - - - - - - Name + + + + + + + NameUnique name for search parameter - required, lower-case, dash-delimited string - TypeType Data type for parameter - Target TypesTarget Types Comma delimited list of target resources - PathPath Corresponding resource element. E.g. ResourceName.node1.node2 - DescriptionDescription Explanation of param. Will default if omitted and Path is specified, otherwise it is required - identifier + identifier token - DocumentManifest.masterIdentifier | DocumentManifest.identifier - + DocumentManifest.masterIdentifier | DocumentManifest.identifier + - subject + subject reference - DocumentManifest.subject - + DocumentManifest.subject + - type + type token - DocumentManifest.type - + DocumentManifest.type + - recipient + recipient reference - DocumentManifest.recipient - + DocumentManifest.recipient + - author + author reference - DocumentManifest.author - + DocumentManifest.author + - created + created date - DocumentManifest.created - + DocumentManifest.created + - status + status token - DocumentManifest.status - + DocumentManifest.status + - description + description string - DocumentManifest.description - + DocumentManifest.description + - contentref + contentref reference - DocumentManifest.content.pReference - + DocumentManifest.content.pReference + - patient + patient reference Patient - DocumentManifest.subject - + DocumentManifest.subject + - source + source uri - DocumentManifest.source - + DocumentManifest.source + - relatedid + relatedid token - DocumentManifest.related.identifier - + DocumentManifest.related.identifier + - relatedref + relatedref reference - DocumentManifest.related.ref - + DocumentManifest.related.ref + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + +
@@ -4811,590 +4814,590 @@ ss:Hidden="1"/> - - - - - - - + x:FullRows="1" ss:StyleID="s112" ss:DefaultRowHeight="15"> + + + + + + + - NameName The name of the operation or parameter (parameters prefixed by operation name + ".") - UseUse "System | Resource | Instance" (operation) "In" or "Out" (parameter) - MinMin Minimum cardinality for a parameter (must be a non-negative integer) - MaxMax maximum cardinality for a parameter - must be "*" or a positive integer - TypeType query/operation for operation; data type for a parameter - ProfileProfile Profile that must apply to parameter's type - TitleTitle The descriptive label for the operation - DocumentationDocumentation Explanation of the operation or parameter - FooterFooter Additional usage notes for an operation - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + +
@@ -5540,255 +5543,255 @@ ss:Hidden="1"/> - - - - - - - - + x:FullRows="1" ss:StyleID="s112" ss:DefaultRowHeight="15"> + + + + + + + + - Event CodeEvent Code Unique code for the event. E.g. patient-link - CategoryCategory Impact of message and time-sensitiveness for processing (see wiki/spec) - DescriptionDescription What triggers the event and what behavior it drives - NotesNotes Additional implementer guidance - Request ResourcesRequest Resources Comma-separated list of focal resources for request - Response ResourcesResponse Resources Comma-separated list of focal resources for response - Request AggregationsRequest Aggregations - Response AggregationsResponse Aggregations - Follow UpsFollow Ups - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - - - - - - - - + + + + + + + +
@@ -5871,262 +5874,262 @@ - - - - + x:FullRows="1" ss:StyleID="s112" ss:DefaultRowHeight="15"> + + + + - NameName Label for profile Comment the row by starting with '!' - FilenameFilename Name of the resulting profile resource-something-profile.xml or …profile.spreadsheet.xml - SourceSource Name of profile spreadsheet or XML file. Defaults to same as Filename - TypeType Type of source (spreadsheet or profile XML file). Default is spreadsheet - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + +
@@ -6205,394 +6208,394 @@ ss:Hidden="1"/> - - - - - - + + + + + + - NameName Descriptive Name - TypeType Default = XML. Leave at default unless told otherwise - DescriptionDescription Description of content/purposes of example - IdentityIdentity resource id - FilenameFilename Filename of XML example file. E.g. resource-example-file-name.xml - ProfileProfile Name of the profile example is associated with (and should be published with) - In BookIn Book Include this example in the book form? - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - + + + + +
@@ -6690,538 +6693,538 @@ ss:Hidden="1"/> - - - - - - - - - - - - - + x:FullRows="1" ss:StyleID="s112" ss:DefaultRowHeight="15"> + + + + + + + + + + + + + - Binding NameBinding Name Unique name across all resources - DefinitionDefinition Formal description of the types of codes allowed for elements with this binding - BindingBinding How is the set of codes defined? - ExampleExample Y = example, blank = incomplete. Only relevant if binding is "value set" - ConformanceConformance - ReferenceReference #tab-name or value set filename(without extension) or URL for reference - DescriptionDescription Text to display for reference bindings (not used otherwise) - OIDOID The OID for the code list if one already exists. (If omitted, one will be assigned) - URIURI Full URI for the code list. (If not specified, defaults to http://hl7.org/fhir/vs - Website/EmailWebsite/Email Contact information for the code list (if different from standard HL7 FHIR contact info) - CopyrightCopyright Copyright information associated with the code list. If not specified, Public Domain assumed - v2v2 uri of v2 value set mapped to - v3v3 uri of v3 value set mapped to - Committee NotesCommittee Notes Unpublished notes - + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + +
@@ -7334,590 +7337,590 @@ ss:RefersTo="='document-reference-status'!R1C1:R1C9" ss:Hidden="1"/> - - - - - - - + x:FullRows="1" ss:StyleID="s137" ss:DefaultRowHeight="15"> + + + + + + + - CodeCode The code to be sent over the wire - IdId Unique number for the code. Required when System is not specified, not permitted otherwise - SystemSystem The URL of the external code system from which the list is selected. Must be the same for all codes if specified. - ParentParent The code this code is a specialization of (if any). Content should be "#" + the Id of the parent code - DisplayDisplay Display value for code. Omit if the code *is* the display value (as for internal codes) - DefinitionDefinition Meaning of the code. Include unless meaning obvious to all users. Required if display not - v2v2 Mappings to v2 codes - See wiki for syntax - v3v3 Mappings to v3 codes - See wiki for syntax - Committee NotesCommittee Notes Additional notes about the code. Not published - current - 1 - + current + 1 + This is the current reference for this document - - - + + + - deprecated - 2 - + deprecated + 2 + This reference has been deprecated - - - + + + - entered-in-error - 3 - + entered-in-error + 3 + This reference was created in error - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + +
@@ -8005,590 +8008,590 @@ ss:Hidden="1"/> - - - - - - - + x:FullRows="1" ss:StyleID="s137" ss:DefaultRowHeight="15"> + + + + + + + - CodeCode The code to be sent over the wire - IdId Unique number for the code. Required when System is not specified, not permitted otherwise - SystemSystem The URL of the external code system from which the list is selected. Must be the same for all codes if specified. - ParentParent The code this code is a specialization of (if any). Content should be "#" + the Id of the parent code - DisplayDisplay Display value for code. Omit if the code *is* the display value (as for internal codes) - DefinitionDefinition Meaning of the code. Include unless meaning obvious to all users. Required if display not - v2v2 Mappings to v2 codes - See wiki for syntax - v3v3 Mappings to v3 codes - See wiki for syntax - Committee NotesCommittee Notes Additional notes about the code. Not published - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + +
diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/documentreference-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/documentreference-spreadsheet.xml index b301c9cf105..882e1d0bdb6 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/documentreference-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/documentreference-spreadsheet.xml @@ -24,7 +24,7 @@ 20730 0 240 - 8 + 1 1 False @@ -1709,7 +1709,7 @@ ss:Name="_FilterDatabase"/> - 400;240400;130 @@ -1909,7 +1909,8 @@ - + 400;300 @@ -3551,12 +3552,13 @@ 600 600 + 1 - 10 + 22 1 - 8 + 14 0 @@ -3572,8 +3574,8 @@ 0 - 14 - 14 + 29 + 21 False @@ -7146,7 +7148,6 @@ 600 600 - 1 diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/encounter-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/encounter-spreadsheet.xml index aa7b3588521..c1e2a00a649 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/encounter-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/encounter-spreadsheet.xml @@ -10,7 +10,7 @@ Brian Postlethwaite 2012-03-19T11:12:07Z 2014-12-06T10:17:09Z - 15.00 + 14.00 @@ -20,7 +20,7 @@ Macintosh HD:Users:cnanjo:repository:fhir:trunk:build:source:encounter:Invariants Invariants - 8832 + 8835 23040 0 0 @@ -805,8 +805,7 @@ + x:FullRows="1" ss:DefaultColumnWidth="65.25" ss:DefaultRowHeight="15"> FHIR Resource-authoring Spreadsheet @@ -843,31 +842,29 @@ ss:RefersTo="='Data Elements'!R1C1:R107C24" ss:Hidden="1"/>
- - - - - - + + + + + + - + - - - - + + + + - - + + - + Element - + 200;0 @@ -1063,7 +1061,7 @@ No clear equivalent in V2.x; active/finished could be inferred from PV1-44, PV1-45, PV2-24; inactive could be inferred from PV2-16 - right0;0 @@ -1362,7 +1360,7 @@ ROL - right500;0 @@ -1570,7 +1568,7 @@ - + Encounter.reason @@ -1702,7 +1700,7 @@ ss:Name="_FilterDatabase"/> - down500;100 @@ -1896,7 +1894,7 @@ ss:Name="_FilterDatabase"/> - rightdown @@ -2221,7 +2219,7 @@ ss:Name="_FilterDatabase"/> - left0;150 @@ -4043,9 +4041,9 @@ 1 - 28 + 34 1 - 9 + 14 0 @@ -4061,8 +4059,8 @@ 0 - 31 - 15 + 39 + 21 False @@ -4138,14 +4136,14 @@ ss:Hidden="1"/>
- - + + - - - + + + Id
- + - + - + NameUnique name for search parameter - required, lower-case, dash-delimited string
- - + + - - - - + + + + Name
- - - - - + + + + + - - + + Event Code
- + @@ -6813,14 +6809,14 @@ ss:Hidden="1"/>
- - - + + + - - + + Name
- - + + - - - - + + + + - - - + + + Binding Name
- - - - - + + + + + - + Code
- - - - - + + + + + - + Code
- - - - - + + + + + - + Code
- - - - - + + + + + - + Code 0 0 661 - 9 + 1 False False @@ -1143,7 +1143,8 @@ - + right @@ -3818,12 +3819,13 @@ 600 600 + 1 - 9 + 4 1 - 11 + 13 0 @@ -3839,8 +3841,8 @@ 0 - 11 - 16 + 7 + 22 False @@ -7582,7 +7584,6 @@ - 1 diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/imagingobjectselection-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/imagingobjectselection-spreadsheet.xml index f53be6aeab4..bf8c6cb2b7a 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/imagingobjectselection-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/imagingobjectselection-spreadsheet.xml @@ -1264,7 +1264,8 @@ - + right @@ -1432,7 +1433,8 @@ - + right @@ -1600,7 +1602,8 @@ - + down @@ -1803,7 +1806,8 @@ - + left @@ -3840,9 +3844,9 @@ 1 - 21 + 20 1 - 1 + 14 0 @@ -3850,6 +3854,7 @@ 1 + 1 2 @@ -3858,7 +3863,7 @@ 0 25 - 0 + 21 False diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu2/medication-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu2/medication-spreadsheet.xml index d4a82186b87..244705a88a9 100644 --- a/hapi-tinder-plugin/src/main/resources/res/dstu2/medication-spreadsheet.xml +++ b/hapi-tinder-plugin/src/main/resources/res/dstu2/medication-spreadsheet.xml @@ -1,9211 +1,9177 @@ - - - - Grahame - Claude Nanjo - 2012-03-19T11:12:07Z - 2015-02-20T04:42:12Z - 14.0 - - - - - - 9800 - 31000 - 0 - 0 - 7 - 1 - - False - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - FHIR Resource-authoring Spreadsheet - - - This spreadsheet is used to support the definition of resources or data types (structures). A complete set of instructions on the various tabs, columns and rules associated with populating this spreadsheet can be found here: - - - http://wiki.hl7.org?title=FHIR_Spreadsheet_Authoring - -
- - -
-