diff --git a/Bundle/Bundle-NonWGSTestOrderForm-CancerSolidTumor-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-CancerSolidTumor-Example.json index 4b84d432..17c81a15 100644 --- a/Bundle/Bundle-NonWGSTestOrderForm-CancerSolidTumor-Example.json +++ b/Bundle/Bundle-NonWGSTestOrderForm-CancerSolidTumor-Example.json @@ -263,7 +263,6 @@ "family": "Hadjkiss" } ], - "gender": "female", "birthDate": "2011-03-19", "address": [ { diff --git a/Bundle/Bundle-NonWGSTestOrderForm-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-Example.json index b749e94e..e27c486b 100644 --- a/Bundle/Bundle-NonWGSTestOrderForm-Example.json +++ b/Bundle/Bundle-NonWGSTestOrderForm-Example.json @@ -134,7 +134,6 @@ "family": "Lieberman" } ], - "gender": "male", "birthDate": "2005-12-19", "deceasedBoolean": false, "address": [ diff --git a/Bundle/Bundle-NonWGSTestOrderForm-FetalScenario-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-FetalScenario-Example.json index 7a427f62..bdb151e1 100644 --- a/Bundle/Bundle-NonWGSTestOrderForm-FetalScenario-Example.json +++ b/Bundle/Bundle-NonWGSTestOrderForm-FetalScenario-Example.json @@ -149,7 +149,6 @@ "family": "Boulder" } ], - "gender": "female", "birthDate": "1980-09-02", "deceasedBoolean": false, "address": [ diff --git a/Bundle/Bundle-NonWGSTestOrderForm-Reanalysis-Example.json b/Bundle/Bundle-NonWGSTestOrderForm-Reanalysis-Example.json index 71855fcf..d672ab02 100644 --- a/Bundle/Bundle-NonWGSTestOrderForm-Reanalysis-Example.json +++ b/Bundle/Bundle-NonWGSTestOrderForm-Reanalysis-Example.json @@ -139,7 +139,6 @@ "family": "Seo" } ], - "gender": "female", "birthDate": "2011-01-26", "deceasedBoolean": false, "address": [ diff --git a/Bundle/Bundle-WGSTestOrderForm-Example.json b/Bundle/Bundle-WGSTestOrderForm-Example.json index 7b098b18..9ba568dc 100644 --- a/Bundle/Bundle-WGSTestOrderForm-Example.json +++ b/Bundle/Bundle-WGSTestOrderForm-Example.json @@ -129,7 +129,6 @@ "family": "Sorrell" } ], - "gender": "male", "birthDate": "2011-04-12", "deceasedBoolean": false, "address": [ diff --git a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json index ca8d693d..ffbe6eab 100644 --- a/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json +++ b/Bundle/UKCore-Bundle-MichaelJonesRequest-Example_minimal.json @@ -85,7 +85,6 @@ ] } ], - "gender": "male", "birthDate": "1989-12-08", "address": [ { diff --git a/Patient/Patient-AnitaLambertsDeceasedPatient-Example.json b/Patient/Patient-AnitaLambertsDeceasedPatient-Example.json index e8ba969c..cf3a4713 100644 --- a/Patient/Patient-AnitaLambertsDeceasedPatient-Example.json +++ b/Patient/Patient-AnitaLambertsDeceasedPatient-Example.json @@ -56,7 +56,6 @@ "family": "Lamberts" } ], - "gender": "female", "birthDate": "1993-11-14", "deceasedBoolean": true, "address": [ diff --git a/Patient/Patient-AnitaLambertsMotherDeceasedPatient-Example.json b/Patient/Patient-AnitaLambertsMotherDeceasedPatient-Example.json index f8871af3..b24b1c1a 100644 --- a/Patient/Patient-AnitaLambertsMotherDeceasedPatient-Example.json +++ b/Patient/Patient-AnitaLambertsMotherDeceasedPatient-Example.json @@ -48,7 +48,6 @@ ] } ], - "gender": "female", "deceasedBoolean": false, "address": [ { diff --git a/Patient/Patient-DemeizaSeo-Example.json b/Patient/Patient-DemeizaSeo-Example.json index edb2afff..79aabd40 100644 --- a/Patient/Patient-DemeizaSeo-Example.json +++ b/Patient/Patient-DemeizaSeo-Example.json @@ -66,7 +66,6 @@ "family": "Seo" } ], - "gender": "female", "birthDate": "2011-01-26", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-FayMutlow-Example.json b/Patient/Patient-FayMutlow-Example.json index 90e7cd55..748354fb 100644 --- a/Patient/Patient-FayMutlow-Example.json +++ b/Patient/Patient-FayMutlow-Example.json @@ -66,7 +66,6 @@ "family": "Mutlow" } ], - "gender": "female", "birthDate": "1990-06-01", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-JamesMetcalfe-Example.json b/Patient/Patient-JamesMetcalfe-Example.json index 2943c654..294cec9b 100644 --- a/Patient/Patient-JamesMetcalfe-Example.json +++ b/Patient/Patient-JamesMetcalfe-Example.json @@ -66,7 +66,6 @@ "family": "Metcalfe" } ], - "gender": "male", "birthDate": "2013-10-10", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-KayBurbridge-Example.json b/Patient/Patient-KayBurbridge-Example.json index 7521736a..f18705da 100644 --- a/Patient/Patient-KayBurbridge-Example.json +++ b/Patient/Patient-KayBurbridge-Example.json @@ -66,7 +66,6 @@ "family": "Burbridge" } ], - "gender": "female", "birthDate": "1983-06-02", "deceasedBoolean": true, "address": [ diff --git a/Patient/Patient-LindsaySorrell-Example.json b/Patient/Patient-LindsaySorrell-Example.json index 392c38d8..c0ae1bc2 100644 --- a/Patient/Patient-LindsaySorrell-Example.json +++ b/Patient/Patient-LindsaySorrell-Example.json @@ -66,7 +66,6 @@ "family": "Sorrell" } ], - "gender": "male", "birthDate": "2011-04-12", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-LindsaySorrellPDS-Example.json b/Patient/Patient-LindsaySorrellPDS-Example.json index accd9125..5777ca9d 100644 --- a/Patient/Patient-LindsaySorrellPDS-Example.json +++ b/Patient/Patient-LindsaySorrellPDS-Example.json @@ -1,6 +1,20 @@ { "resourceType": "Patient", "id": "Patient-LindsaySorrellPDS-Example", + "extension": [ + { + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BirthSex", + "valueCodeableConcept": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", + "code": "M", + "display": "Male" + } + ] + } + } + ], "meta": { "versionId": "2", "security": [ @@ -40,7 +54,6 @@ "family": "Sorrell" } ], - "gender": "male", "birthDate": "2011-04-12", "address": [ { diff --git a/Patient/Patient-MeirLieberman-Example.json b/Patient/Patient-MeirLieberman-Example.json index 506a1943..7805bead 100644 --- a/Patient/Patient-MeirLieberman-Example.json +++ b/Patient/Patient-MeirLieberman-Example.json @@ -71,7 +71,6 @@ "family": "Lieberman" } ], - "gender": "male", "birthDate": "2005-12-19", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-MeirLiebermanPDS-Example.json b/Patient/Patient-MeirLiebermanPDS-Example.json index 9074d19d..d906734b 100644 --- a/Patient/Patient-MeirLiebermanPDS-Example.json +++ b/Patient/Patient-MeirLiebermanPDS-Example.json @@ -11,6 +11,20 @@ } ] }, + "extension": [ + { + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BirthSex", + "valueCodeableConcept": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender", + "code": "M", + "display": "Male" + } + ] + } + } + ], "identifier": [ { "system": "https://fhir.nhs.uk/Id/nhs-number", @@ -40,7 +54,6 @@ "family": "Lieberman" } ], - "gender": "male", "birthDate": "2005-12-19", "address": [ { diff --git a/Patient/Patient-PatrickSammy-Example.json b/Patient/Patient-PatrickSammy-Example.json index a3593ce2..84c1b36b 100644 --- a/Patient/Patient-PatrickSammy-Example.json +++ b/Patient/Patient-PatrickSammy-Example.json @@ -56,7 +56,6 @@ "family": "Sammy" } ], - "gender": "male", "birthDate": "1982-10-06", "address": [ { diff --git a/Patient/Patient-PheobeSmitham-Example.json b/Patient/Patient-PheobeSmitham-Example.json index 11514e60..d00bb016 100644 --- a/Patient/Patient-PheobeSmitham-Example.json +++ b/Patient/Patient-PheobeSmitham-Example.json @@ -66,7 +66,6 @@ "family": "Smitham" } ], - "gender": "female", "birthDate": "2013-09-27", "deceasedBoolean": true, "address": [ diff --git a/Patient/Patient-PheobeSmithamFather-Example.json b/Patient/Patient-PheobeSmithamFather-Example.json index 7568530b..4b4fcdfe 100644 --- a/Patient/Patient-PheobeSmithamFather-Example.json +++ b/Patient/Patient-PheobeSmithamFather-Example.json @@ -56,7 +56,6 @@ "family": "Lawrence" } ], - "gender": "male", "birthDate": "1981-08-03", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-PheobeSmithamMother-Example.json b/Patient/Patient-PheobeSmithamMother-Example.json index 86f03c54..7c7d02dd 100644 --- a/Patient/Patient-PheobeSmithamMother-Example.json +++ b/Patient/Patient-PheobeSmithamMother-Example.json @@ -56,7 +56,6 @@ "family": "Smitham" } ], - "gender": "female", "deceasedBoolean": false, "address": [ { diff --git a/Patient/Patient-RyanneBoulder-Example.json b/Patient/Patient-RyanneBoulder-Example.json index 1aedabb4..edf799e5 100644 --- a/Patient/Patient-RyanneBoulder-Example.json +++ b/Patient/Patient-RyanneBoulder-Example.json @@ -66,7 +66,6 @@ "family": "Boulder" } ], - "gender": "female", "birthDate": "1980-09-02", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-SalimaPomfrets-Example.json b/Patient/Patient-SalimaPomfrets-Example.json index 5a291d66..37e0ece0 100644 --- a/Patient/Patient-SalimaPomfrets-Example.json +++ b/Patient/Patient-SalimaPomfrets-Example.json @@ -66,7 +66,6 @@ "family": "Pomfrets" } ], - "gender": "female", "birthDate": "1993-11-27", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-TimMclullichs-Example.json b/Patient/Patient-TimMclullichs-Example.json index 981510ed..a9359dd7 100644 --- a/Patient/Patient-TimMclullichs-Example.json +++ b/Patient/Patient-TimMclullichs-Example.json @@ -66,7 +66,6 @@ "family": "Mclullichs" } ], - "gender": "male", "birthDate": "1954-10-29", "deceasedBoolean": false, "address": [ diff --git a/Patient/Patient-ZelmaHadjkiss-Example.json b/Patient/Patient-ZelmaHadjkiss-Example.json index 2b600393..82ad7174 100644 --- a/Patient/Patient-ZelmaHadjkiss-Example.json +++ b/Patient/Patient-ZelmaHadjkiss-Example.json @@ -66,7 +66,6 @@ "family": "Hadjkiss" } ], - "gender": "female", "birthDate": "2011-03-19", "address": [ { diff --git a/Patient/UKCore-Patient-MichaelJones-Example.json b/Patient/UKCore-Patient-MichaelJones-Example.json index ddc56f42..483c3ee5 100644 --- a/Patient/UKCore-Patient-MichaelJones-Example.json +++ b/Patient/UKCore-Patient-MichaelJones-Example.json @@ -53,7 +53,6 @@ ] } ], - "gender": "male", "birthDate": "1989-12-08", "address": [ { diff --git a/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json b/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json index ecd7bfe8..42b4b865 100644 --- a/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json +++ b/StructureDefinition/NHSDigital-Patient-Genomics.StructureDefinition.json @@ -37,7 +37,8 @@ "id": "Patient.extension:birthSex", "path": "Patient.extension", "sliceName": "birthSex", - "min": 1 + "min": 0, + "max": "1" }, { "id": "Patient.extension:cadavericDonor", @@ -159,7 +160,8 @@ { "id": "Patient.gender", "path": "Patient.gender", - "min": 1 + "min": 0, + "max": "1" }, { "id": "Patient.birthDate",