diff --git a/input/fsh/examples/CPTS/example-orgacpts1.fsh b/input/fsh/examples/CPTS/example-orgacpts1.fsh index c3a88f0581..9c342c3250 100644 --- a/input/fsh/examples/CPTS/example-orgacpts1.fsh +++ b/input/fsh/examples/CPTS/example-orgacpts1.fsh @@ -2,10 +2,7 @@ Instance: ExampleOrgaCPTS1 InstanceOf: FrOrganizationAgregateurCPTS Description: "Exemple d'organisation CPTS 1" Usage: #example - - -* identifier[0].system = "urn:oid:1.2.250.1.71.4.2.2" -* identifier[0].value = "1950047225" +* identifier[idNatSt].value = "1950047225" * name = "CPTS AXE MAJEUR" * telecom[0].system = #phone * telecom[0].value = "+33102030405" diff --git a/input/fsh/profiles/CPTS/FrOrganizationAgregateurCPTS.fsh b/input/fsh/profiles/CPTS/FrOrganizationAgregateurCPTS.fsh index 59dbfb80f6..fc5d9f443d 100644 --- a/input/fsh/profiles/CPTS/FrOrganizationAgregateurCPTS.fsh +++ b/input/fsh/profiles/CPTS/FrOrganizationAgregateurCPTS.fsh @@ -3,10 +3,8 @@ Parent: fr-core-organization Id: sas-cpts-organization-aggregator Description: "Profil dérivé de FrOrganization pour le cas d'usage agrégateur de la plateforme SAS - cas d'usage CPTS" -* identifier 1..1 -* identifier.type = $fr-location-identifier-type#IDNST -* identifier.system = "urn:oid:1.2.250.1.71.4.2.2" -* identifier obeys FINESS-invariant +* identifier[idNatSt] 1..1 +* identifier[idNatSt] obeys FINESS-invariant * name 0..1 MS * telecom 0..* MS diff --git a/input/fsh/profiles/SOS/FrOrganizationAgregateurSOS.fsh b/input/fsh/profiles/SOS/FrOrganizationAgregateurSOS.fsh index 1d2b782fb2..3ef3843631 100644 --- a/input/fsh/profiles/SOS/FrOrganizationAgregateurSOS.fsh +++ b/input/fsh/profiles/SOS/FrOrganizationAgregateurSOS.fsh @@ -4,10 +4,8 @@ Id: sas-sos-organization-aggregator Description: "Profil d'Organization, dérivé de FrOrganization, pour le service d’agrégation de créneaux de la plateforme SAS - cas d’usage SOS Médecins" -* identifier 1..1 -* identifier.type = $fr-location-identifier-type#IDNST -* identifier.system = "urn:oid:1.2.250.1.71.4.2.2" -* identifier obeys SIRET-invariant +* identifier[idNatSt] 1..1 +* identifier [idNatSt] obeys SIRET-invariant Invariant: SIRET-invariant diff --git a/input/fsh/profiles/SOS/FrScheduleAgregateurSOS.fsh b/input/fsh/profiles/SOS/FrScheduleAgregateurSOS.fsh index 3f17e8ae11..fa690d2275 100644 --- a/input/fsh/profiles/SOS/FrScheduleAgregateurSOS.fsh +++ b/input/fsh/profiles/SOS/FrScheduleAgregateurSOS.fsh @@ -3,6 +3,9 @@ Parent: fr-core-schedule Id: sas-sos-schedule-aggregator Description: "Profil de Schedule, dérivé de FrSchedule, pour le service d’agrégation de créneaux de la plateforme SAS - cas d’usage SOS Médecins" +* meta.profile contains sas-sos-schedule-aggregator 0..1 +* meta.profile[sas-sos-schedule-aggregator] = Canonical(sas-sos-schedule-aggregator) + * actor only Reference(fr-core-location) //* actor ^type.aggregation[0] = #referenced * actor.reference 1.. \ No newline at end of file