Skip to content

Commit

Permalink
Merge pull request #57 from samply/fix/lessConstraints
Browse files Browse the repository at this point in the history
Fix/less constraints
  • Loading branch information
alexanderkiel authored Feb 21, 2020
2 parents e78b1a8 + a900d18 commit e907d43
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 166 deletions.
2 changes: 1 addition & 1 deletion bbmri-ig/input/de.bbmri.fhir.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@
]

}
}
}
5 changes: 0 additions & 5 deletions bbmri-ig/input/resources/Bmi.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
"code": "dateTime"
}
]
},
{
"id": "Observation.component",
"path": "Observation.component",
"max": "0"
}
]
}
Expand Down
5 changes: 0 additions & 5 deletions bbmri-ig/input/resources/BodyHeight.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
"code": "dateTime"
}
]
},
{
"id": "Observation.component",
"path": "Observation.component",
"max": "0"
}
]
}
Expand Down
5 changes: 0 additions & 5 deletions bbmri-ig/input/resources/BodyWeight.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
"code": "dateTime"
}
]
},
{
"id": "Observation.component",
"path": "Observation.component",
"max": "0"
}
]
}
Expand Down
5 changes: 0 additions & 5 deletions bbmri-ig/input/resources/Collection.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,6 @@
"max": "1",
"mustSupport": true
},
{
"id": "Organization.telecom",
"path": "Organization.telecom",
"max": "0"
},
{
"id": "Organization.address.extension",
"path": "Organization.address.extension",
Expand Down
65 changes: 0 additions & 65 deletions bbmri-ig/input/resources/Condition.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,6 @@
"derivation": "constraint",
"differential": {
"element": [
{
"id": "Condition.identifier",
"path": "Condition.identifier",
"max": "0"
},
{
"id": "Condition.clinicalStatus",
"path": "Condition.clinicalStatus",
"max": "0"
},
{
"id": "Condition.verificationStatus",
"path": "Condition.verificationStatus",
"max": "0"
},
{
"id": "Condition.category",
"path": "Condition.category",
"max": "0"
},
{
"id": "Condition.severity",
"path": "Condition.severity",
"max": "0"
},
{
"id": "Condition.code",
"path": "Condition.code",
Expand All @@ -58,11 +33,6 @@
"rules": "open"
}
},
{
"id": "Condition.code.coding.userSelected",
"path": "Condition.code.coding.userSelected",
"max": "0"
},
{
"id": "Condition.code.coding:icd-10-who",
"path": "Condition.code.coding",
Expand Down Expand Up @@ -98,11 +68,6 @@
}
]
},
{
"id": "Condition.bodySite",
"path": "Condition.bodySite",
"max": "0"
},
{
"id": "Condition.subject",
"path": "Condition.subject",
Expand All @@ -116,16 +81,6 @@
],
"mustSupport": true
},
{
"id": "Condition.subject.identifier",
"path": "Condition.subject.identifier",
"max": "0"
},
{
"id": "Condition.subject.display",
"path": "Condition.subject.display",
"max": "0"
},
{
"id": "Condition.encounter",
"path": "Condition.encounter",
Expand All @@ -149,26 +104,6 @@
"code": "dateTime"
}
]
},
{
"id": "Condition.asserter",
"path": "Condition.asserter",
"max": "0"
},
{
"id": "Condition.stage",
"path": "Condition.stage",
"max": "0"
},
{
"id": "Condition.evidence",
"path": "Condition.evidence",
"max": "0"
},
{
"id": "Condition.note",
"path": "Condition.note",
"max": "0"
}
]
}
Expand Down
52 changes: 22 additions & 30 deletions bbmri-ig/input/resources/Specimen.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,28 @@
],
"mustSupport": true
},
{
"id": "Specimen.extension:diagnosis.value[x].coding",
"path": "Specimen.extension.value[x].coding",
"slicing": {
"discriminator": [
{
"type": "value",
"path": "system"
},
{
"type": "value",
"path": "version"
},
{
"type": "value",
"path": "$this"
}
],
"rules": "closed"
},
"min": 1
},
{
"id": "Specimen.extension:custodian",
"path": "Specimen.extension",
Expand Down Expand Up @@ -89,31 +111,11 @@
],
"mustSupport": true
},
{
"id": "Specimen.subject.identifier",
"path": "Specimen.subject.identifier",
"max": "0"
},
{
"id": "Specimen.subject.display",
"path": "Specimen.subject.display",
"max": "0"
},
{
"id": "Specimen.request",
"path": "Specimen.request",
"max": "0"
},
{
"id": "Specimen.collection",
"path": "Specimen.collection",
"mustSupport": true
},
{
"id": "Specimen.collection.collector",
"path": "Specimen.collection.collector",
"max": "0"
},
{
"id": "Specimen.collection.collected[x]",
"path": "Specimen.collection.collected[x]",
Expand All @@ -124,16 +126,6 @@
],
"mustSupport": true
},
{
"id": "Specimen.collection.quantity",
"path": "Specimen.collection.quantity",
"max": "0"
},
{
"id": "Specimen.collection.method",
"path": "Specimen.collection.method",
"max": "0"
},
{
"id": "Specimen.collection.bodySite",
"path": "Specimen.collection.bodySite",
Expand Down
50 changes: 0 additions & 50 deletions bbmri-ig/input/resources/TobaccoUse.StructureDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@
"derivation": "constraint",
"differential": {
"element": [
{
"id": "Observation.identifier",
"path": "Observation.identifier",
"max": "0"
},
{
"id": "Observation.basedOn",
"path": "Observation.basedOn",
"max": "0"
},
{
"id": "Observation.category",
"path": "Observation.category",
"max": "0"
},
{
"id": "Observation.code.coding",
"path": "Observation.code.coding",
Expand Down Expand Up @@ -96,16 +81,6 @@
],
"mustSupport": true
},
{
"id": "Observation.issued",
"path": "Observation.issued",
"max": "0"
},
{
"id": "Observation.performer",
"path": "Observation.performer",
"max": "0"
},
{
"id": "Observation.value[x]",
"path": "Observation.value[x]",
Expand All @@ -120,26 +95,11 @@
"valueSet": "http://hl7.org/fhir/uv/ips/ValueSet/current-smoking-status-uv-ips"
}
},
{
"id": "Observation.dataAbsentReason",
"path": "Observation.dataAbsentReason",
"max": "0"
},
{
"id": "Observation.interpretation",
"path": "Observation.interpretation",
"max": "0"
},
{
"id": "Observation.bodySite",
"path": "Observation.bodySite",
"max": "0"
},
{
"id": "Observation.method",
"path": "Observation.method",
"max": "0"
},
{
"id": "Observation.specimen",
"path": "Observation.specimen",
Expand All @@ -159,16 +119,6 @@
"id": "Observation.device",
"path": "Observation.device",
"max": "0"
},
{
"id": "Observation.referenceRange",
"path": "Observation.referenceRange",
"max": "0"
},
{
"id": "Observation.component",
"path": "Observation.component",
"max": "0"
}
]
}
Expand Down

0 comments on commit e907d43

Please sign in to comment.