From 508f3bcbd5a5d96bc013811332b760f97edbb7f7 Mon Sep 17 00:00:00 2001
From: paulineheurtebise <122790741+paulineheurtebise@users.noreply.github.com>
Date: Fri, 3 Nov 2023 18:48:51 +0100
Subject: [PATCH 01/27] =?UTF-8?q?D=C3=A9but=20exemple=20professionnel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
input/fsh/examples/PP15-Practitioner.fsh | 52 ++++++++++++++++++++++++
input/fsh/examples/PP16-Practitioner.fsh | 36 ++++++++++++++++
2 files changed, 88 insertions(+)
create mode 100644 input/fsh/examples/PP15-Practitioner.fsh
create mode 100644 input/fsh/examples/PP16-Practitioner.fsh
diff --git a/input/fsh/examples/PP15-Practitioner.fsh b/input/fsh/examples/PP15-Practitioner.fsh
new file mode 100644
index 0000000000..6c5bb592ea
--- /dev/null
+++ b/input/fsh/examples/PP15-Practitioner.fsh
@@ -0,0 +1,52 @@
+Instance: pp15-practitioner
+InstanceOf: AsDrPractitionerProfile
+Usage: #example
+
+//Identifiant technique
+* id = "1586981"
+
+//Metadata
+* meta.versionId = "0.1"
+* meta.source = "https://annuaire.sante.fr"
+* meta.lastUpdated = "2019-08-31T01:00:00.000+01:00"
+* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+//Active
+* active = true
+
+//Nom
+* name[+].prefix = "MME"
+* name[=].use = #usual
+* name[+].prefix = "MME"
+* name[=].use = #official
+* name[=].family = "MOREL"
+* name[=].given = "Victoire"
+
+//Qualification
+
+* qualification[+].code.coding[degreeR48].system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+* qualification[=].code.coding[degreeR48].code = #DE05
+* qualification[=].period.start = "2018-06-15"
+
+* qualification[+].code.coding[degreeR50].system = "https://mos.esante.gouv.fr/NOS/TRE_R50-DESCGroupe1Diplome/FHIR/TRE-R50-DESCGroupe1Diplome"
+* qualification[=].code.coding[degreeR50].code = #DSM220
+* qualification[=].period.start = "2018-06-29"
+
+* qualification[+].code.coding[degreeR49].system = "https://mos.esante.gouv.fr/NOS/TRE_R49-DiplomeEtudeSpecialisee/FHIR/TRE-R49-DiplomeEtudeSpecialisee"
+* qualification[=].code.coding[degreeR49].code = #DSM24
+* qualification[=].period.start = "2018-06-15"
+
+* qualification[+].code.coding[degreeR49].system = "https://mos.esante.gouv.fr/NOS/TRE_R49-DiplomeEtudeSpecialisee/FHIR/TRE-R49-DiplomeEtudeSpecialisee"
+* qualification[=].code.coding[degreeR49].code = #DSM24
+* qualification[=].period.start = "2018-06-15"
+
+//Extension nationality
+* extension[+].url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+* extension[=].extension[+].url = "code"
+* extension[=].extension[=].valueCodeableConcept.coding = https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays#99100
+
+//Extension birthPlace
+* extension[+].url = "https://apifhir.annuaire.sante.fr/exposed/structuredefinition/practitioner-birthPlace"
+* extension[=].valueAddress.text = "BORDEAUX"
+* extension[=].valueAddress.extension[+].url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+* extension[=].valueAddress.extension[=].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R13-CommuneOM/FHIR/TRE-R13-CommuneOM#33063
\ No newline at end of file
diff --git a/input/fsh/examples/PP16-Practitioner.fsh b/input/fsh/examples/PP16-Practitioner.fsh
new file mode 100644
index 0000000000..67b9fcc75b
--- /dev/null
+++ b/input/fsh/examples/PP16-Practitioner.fsh
@@ -0,0 +1,36 @@
+Instance: pp16-practitioner
+InstanceOf: AsDrPractitionerProfile
+Usage: #example
+
+//Identifiant technique
+* id = "3719500"
+
+//Metadata
+* meta.versionId = "0.1"
+* meta.source = "https://annuaire.sante.fr"
+* meta.lastUpdated = "2019-08-31T01:00:00.000+01:00"
+* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+//Active
+* active = true
+
+//Nom
+* name[+].prefix = "M"
+* name[=].use = #usual
+
+* name[+].prefix = "M"
+* name[=].use = #official
+* name[=].family = "CHATELIER"
+* name[=].given = "David"
+
+//Qualification
+* qualification[+].code.coding[degreeR48].system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+* qualification[=].code.coding[degreeR48].code = #DE01
+* qualification[=].period.start = "2019-01-08"
+
+//Extension nationality
+* extension[+].url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+* extension[=].extension[+].url = "code"
+* extension[=].extension[=].valueCodeableConcept.coding = https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays#99100
+
+
From d5dc10ec6a39b11a009b70679883a90d0a1fc691 Mon Sep 17 00:00:00 2001
From: paulineheurtebise <122790741+paulineheurtebise@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:51:29 +0100
Subject: [PATCH 02/27] Exemples - 1ere version
---
input/fsh/examples/DP/PP16DP-Organization.fsh | 65 +++++++++
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 83 ++++++++++++
.../examples/DP/PP16DP-PractitionerRole.fsh | 90 +++++++++++++
.../examples/DP/PP19DP-Organization-EG-CH.fsh | 98 ++++++++++++++
.../DP/PP19DP-Organization-EJ-Cab.fsh | 60 +++++++++
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 83 ++++++++++++
.../DP/PP19DP-PractitionerRole-Lib.fsh | 90 +++++++++++++
.../DP/PP19DP-PractitionerRole-Sal.fsh | 90 +++++++++++++
.../DR/PP16DR-Organization-issuer.fsh | 12 ++
input/fsh/examples/DR/PP16DR-Organization.fsh | 65 +++++++++
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 125 ++++++++++++++++++
.../examples/DR/PP16DR-PractitionerRole.fsh | 94 +++++++++++++
.../examples/DR/PP19DR-Organization-EG-CH.fsh | 98 ++++++++++++++
.../DR/PP19DR-Organization-EJ-Cab.fsh | 60 +++++++++
.../DR/PP19DR-Organization-issuer.fsh | 12 ++
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 125 ++++++++++++++++++
.../DR/PP19DR-PractitionerRole-Lib.fsh | 94 +++++++++++++
.../DR/PP19DR-PractitionerRole-Sal.fsh | 94 +++++++++++++
input/fsh/examples/PP15-Practitioner.fsh | 52 --------
input/fsh/examples/PP16-Practitioner.fsh | 36 -----
input/images/exemples.svg | 51 +++++++
input/pagecontent/example.md | 0
22 files changed, 1489 insertions(+), 88 deletions(-)
create mode 100644 input/fsh/examples/DP/PP16DP-Organization.fsh
create mode 100644 input/fsh/examples/DP/PP16DP-Practitioner.fsh
create mode 100644 input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
create mode 100644 input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
create mode 100644 input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
create mode 100644 input/fsh/examples/DP/PP19DP-Practitioner.fsh
create mode 100644 input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
create mode 100644 input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
create mode 100644 input/fsh/examples/DR/PP16DR-Organization-issuer.fsh
create mode 100644 input/fsh/examples/DR/PP16DR-Organization.fsh
create mode 100644 input/fsh/examples/DR/PP16DR-Practitioner.fsh
create mode 100644 input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-Organization-issuer.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-Practitioner.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
create mode 100644 input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
delete mode 100644 input/fsh/examples/PP15-Practitioner.fsh
delete mode 100644 input/fsh/examples/PP16-Practitioner.fsh
create mode 100644 input/images/exemples.svg
create mode 100644 input/pagecontent/example.md
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
new file mode 100644
index 0000000000..c428a2bcb4
--- /dev/null
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -0,0 +1,65 @@
+Instance: pp16dp-organization
+InstanceOf: AsDpOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\4-Delta_jour2\PM\PM2PM2.json
+
+// Identifiant technique
+* id = "481677DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-02T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+][idNatSt]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "1580008803"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #IDNST
+* identifier[+][finess]
+ * system = "http://finess.esante.gouv.fr"
+ * use = #official
+ * value = "580008803"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #FINEJ
+* identifier[+][adeliRpps]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "F58000880311022013"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #INTRN
+
+// Nom
+* name = "PHARMACIE NOLOT"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #LEGAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA33
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-09-02"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
new file mode 100644
index 0000000000..1bebb17be4
--- /dev/null
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -0,0 +1,83 @@
+Instance: pp16dp-practitioner
+InstanceOf: AsDpPractitionerProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\Practitioner_PP16.json
+
+// Identifiant technique
+* id = "3719500DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-08-31T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatPs][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.1"
+ * use = #official
+ * value = "810102727017"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #IDNPS
+* identifier[rpps][+]
+ * system = "http://rpps.fr"
+ * use = #official
+ * value = "10102727017"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #RPPS
+
+// Nom
+* name[+]
+ * prefix = "M"
+
+// Langage
+* language = #fr
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0612122216"
+ * rank = 1
+* telecom[+]
+ * system = #email
+ * value = "davidchatelier@orange.fr"
+
+// Qualification
+* qualification[+]
+ * code
+ * coding[+][degreeR48]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+ * code = #DE01
+ * coding[+][degreeType]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
+ * code = #DE
+
+// Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+// Lieu de naissance
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
+ * valueAddress
+ * text = "COSNE-COURS-SUR-LOIRE"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #58086
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
new file mode 100644
index 0000000000..ac6d5122cf
--- /dev/null
+++ b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
@@ -0,0 +1,90 @@
+Instance: pp16dp-practitioner-role
+InstanceOf: AsDpPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers :
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\professionalRole_ExePro_PP16.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\organizationalRole_SituExe_PP16.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "5015602DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-08-31T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "1001500032"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/3719500)
+
+// Lien EG
+* organization = Reference(Organization/481677)
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #21
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #L
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "CHATELIER"
+ * given[+] = "David"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOP
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
new file mode 100644
index 0000000000..5a16bdb846
--- /dev/null
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -0,0 +1,98 @@
+Instance: pp19dp-organization-eg-cab
+InstanceOf: AsDpOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\2-Full_jour1\PM\PM1\PM1.json
+
+// Identifiant technique
+* id = "158480DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-01T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatSt][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "1754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #IDNST
+* identifier[+][finess]
+ * system = "http://finess.esante.gouv.fr"
+ * use = #official
+ * value = "754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #FINEG
+* identifier[adeliRpps][+]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "F754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #INTRN
+
+// Nom
+* name = "CH EURE-SEINE"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #GEOGRAPHICAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA01
+* type[activiteINSEE][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
+ * code = #86.10Z
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0450636363"
+ * rank = 1
+* telecom[+]
+ * system = #fax
+ * value = "0450455933"
+
+// Adresse
+* address
+ * city = "75014 PARIS"
+ * postalCode = "75014"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #75114
+ * line
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
+ * valueString = "96"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+ * valueString = "R"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+ * valueString = "DIDOT"
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-06-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
new file mode 100644
index 0000000000..6a4f2e6960
--- /dev/null
+++ b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
@@ -0,0 +1,60 @@
+Instance: pp19dp-organization-ej-cab
+InstanceOf: AsDpOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\2-Full_jour1\PM\PM7\PM7.json
+
+// Identifiant technique
+* id = "548812DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-01T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatSt][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "410005531586003"
+ * type
+ * coding[+]
+ * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * code = #IDNST
+* identifier[adeliRpps][+]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "REJ10000000800887"
+ * type
+ * coding[+]
+ * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * code = #INTRN
+
+// Nom
+* name = "CABINET SAINT ANTOINE"
+
+// Alias
+* alias[+] = "CABINET DE GROUPE"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #LEGAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA08
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-04-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
new file mode 100644
index 0000000000..6d028fa658
--- /dev/null
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -0,0 +1,83 @@
+Instance: pp19dp-practitioner
+InstanceOf: AsDpPractitionerProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\Practitioner_PP19.json
+
+// Identifiant technique
+* id = "334081DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "urn:oid:1.2.250.1.71.4.2.1"
+ * use = #official
+ * value = "810003461033"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #IDNPS
+* identifier[+]
+ * system = "http://rpps.fr"
+ * use = #official
+ * value = "10003461033"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #RPPS
+
+// Nom
+* name[+]
+ * prefix = "M"
+
+// Langage
+* language = #fr
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0603590791"
+ * rank = 1
+* telecom[+]
+ * system = #email
+ * value = "jeromebonnet@hotmail.fr"
+
+// Qualification
+* qualification[+]
+ * code
+ * coding[degreeR48]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+ * code = #DE05
+ * coding[degreeType]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
+ * code = #DE
+
+// Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+// Lieu de naissance
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
+ * valueAddress
+ * text = "NANTES"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #44109
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
new file mode 100644
index 0000000000..8bf9963d29
--- /dev/null
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
@@ -0,0 +1,90 @@
+Instance: pp19dp-practitioner-role-lib
+InstanceOf: AsDpPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers :
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\professionalRole_ExePro_PP19.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\organizationalRole_SituExe_PP19.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "1738459DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "1010399870"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/334081)
+
+// Lien EJ
+* organization = Reference(Organization/548812)
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #10
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #L
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "BONNET"
+ * given[+] = "Jerome"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOM
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-10"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-30"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
new file mode 100644
index 0000000000..83ff63e7b4
--- /dev/null
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
@@ -0,0 +1,90 @@
+Instance: pp19dp-practitioner-role-sal
+InstanceOf: AsDpPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\professionalRole_ExePro_PP19.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\organizationalRole_SituExe_PP19.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "1578230DP"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "F58000880311022013"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/334081)
+
+// Lien EG
+* organization = Reference(Organization/158480)
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #10
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #S
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "BONNET"
+ * given[+] = "Jerome"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOM
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-10"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-30"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Organization-issuer.fsh b/input/fsh/examples/DR/PP16DR-Organization-issuer.fsh
new file mode 100644
index 0000000000..6949a476a5
--- /dev/null
+++ b/input/fsh/examples/DR/PP16DR-Organization-issuer.fsh
@@ -0,0 +1,12 @@
+Instance: pp16dr-organization-issuer
+InstanceOf: AsDpOrganizationProfile
+Usage: #example
+
+// Identifiant technique
+* id = "u63"
+
+// Actif
+* active = true
+
+// Nom
+* name = "Clermont-Ferrand 1, Université d'Auvergne"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
new file mode 100644
index 0000000000..28cd76ec41
--- /dev/null
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -0,0 +1,65 @@
+Instance: pp16dr-organization
+InstanceOf: AsDrOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\4-Delta_jour2\PM\PM2PM2.json
+
+// Identifiant technique
+* id = "481677"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-02T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+][idNatSt]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "1580008803"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #IDNST
+* identifier[+][finess]
+ * system = "http://finess.esante.gouv.fr"
+ * use = #official
+ * value = "580008803"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #FINEJ
+* identifier[+][adeliRpps]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "F58000880311022013"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #INTRN
+
+// Nom
+* name = "PHARMACIE NOLOT"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #LEGAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA33
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-09-02"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
new file mode 100644
index 0000000000..e304e5784b
--- /dev/null
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -0,0 +1,125 @@
+Instance: pp16dr-practitioner
+InstanceOf: AsDrPractitionerProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\Practitioner_PP16.json
+
+// Identifiant technique
+* id = "3719500"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-08-31T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatPs][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.1"
+ * use = #official
+ * value = "810102727017"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #IDNPS
+* identifier[rpps][+]
+ * system = "http://rpps.fr"
+ * use = #official
+ * value = "10102727017"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #RPPS
+
+// Nom
+* name[+]
+ * prefix = "M"
+ * use = #usual
+* name[+]
+ * prefix = "M"
+ * use = #official
+ * family = "CHATELIER"
+ * given[+] = "David"
+
+// Genre
+* gender = #male
+
+// Date de naissance
+* birthDate = "1976-07-17"
+
+// Langage
+* language = #fr
+
+// Communication
+* communication[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G00-Langue/FHIR/TRE-G00-Langue"
+ * code = #fr
+
+// Adresse
+* address[+]
+ * city = "58400 LA-CHARITE-SUR-LOIRE"
+ * postalCode = "58400"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #58059
+ * line[+]
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
+ * valueString = "10"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+ * valueString = "PL"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+ * valueString = "DES PECHEURS"
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0612122216"
+ * rank = 1
+* telecom[+]
+ * system = #email
+ * value = "davidchatelier@orange.fr"
+
+// Qualification
+* qualification[+]
+ * code
+ * coding[+][degreeR48]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+ * code = #DE01
+ * coding[+][degreeType]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
+ * code = #DE
+ * period
+ * start = "2019-01-08"
+ * issuer = Reference(Organization/u63)
+
+// Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+// Lieu de naissance
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
+ * valueAddress
+ * text = "COSNE-COURS-SUR-LOIRE"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #58086
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
new file mode 100644
index 0000000000..6126989a9e
--- /dev/null
+++ b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
@@ -0,0 +1,94 @@
+Instance: pp16dr-practitioner-role
+InstanceOf: AsDrPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers :
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\professionalRole_ExePro_PP16.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\1-Full_jour0\PP\PP16\organizationalRole_SituExe_PP16.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "5015602"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-08-31T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "1001500032"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/3719500)
+
+// Lien EG
+* organization = Reference(Organization/481677)
+
+// Période
+* period
+ * start = "2019-01-31"
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #21
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #L
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "CHATELIER"
+ * given[+] = "David"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOP
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
new file mode 100644
index 0000000000..ad6b13c0fa
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -0,0 +1,98 @@
+Instance: pp19dr-organization-eg-cab
+InstanceOf: AsDrOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\2-Full_jour1\PM\PM1\PM1.json
+
+// Identifiant technique
+* id = "158480"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-01T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatSt][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "1754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #IDNST
+* identifier[+][finess]
+ * system = "http://finess.esante.gouv.fr"
+ * use = #official
+ * value = "754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #FINEG
+* identifier[adeliRpps][+]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "F754567860"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * code = #INTRN
+
+// Nom
+* name = "CH EURE-SEINE"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #GEOGRAPHICAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA01
+* type[activiteINSEE][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
+ * code = #86.10Z
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0450636363"
+ * rank = 1
+* telecom[+]
+ * system = #fax
+ * value = "0450455933"
+
+// Adresse
+* address
+ * city = "75014 PARIS"
+ * postalCode = "75014"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #75114
+ * line
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
+ * valueString = "96"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+ * valueString = "R"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+ * valueString = "DIDOT"
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-06-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
new file mode 100644
index 0000000000..caac105518
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -0,0 +1,60 @@
+Instance: pp19dr-organization-ej-cab
+InstanceOf: AsDrOrganizationProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\2-Full_jour1\PM\PM7\PM7.json
+
+// Identifiant technique
+* id = "548812"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-01T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-organization"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[idNatSt][+]
+ * system = "urn:oid:1.2.250.1.71.4.2.2"
+ * use = #official
+ * value = "410005531586003"
+ * type
+ * coding[+]
+ * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * code = #IDNST
+* identifier[adeliRpps][+]
+ * system = "https://annuaire.sante.fr"
+ * use = #official
+ * value = "REJ10000000800887"
+ * type
+ * coding[+]
+ * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * code = #INTRN
+
+// Nom
+* name = "CABINET SAINT ANTOINE"
+
+// Alias
+* alias[+] = "CABINET DE GROUPE"
+
+// Langage
+* language = #fr
+
+// Type
+* type[organizationType][+]
+ * coding
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * code = #LEGAL-ENTITY
+* type[secteurActiviteRASS][+]
+ * coding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
+ * code = #SA08
+
+// Période
+* extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+ * valuePeriod
+ * start = "2019-04-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Organization-issuer.fsh b/input/fsh/examples/DR/PP19DR-Organization-issuer.fsh
new file mode 100644
index 0000000000..369b6d9edf
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-Organization-issuer.fsh
@@ -0,0 +1,12 @@
+Instance: pp19dr-organization-issuer
+InstanceOf: AsDrOrganizationProfile
+Usage: #example
+
+// Identifiant technique
+* id = "u33"
+
+// Actif
+* active = true
+
+// Nom
+* name = "Bordeaux 2, Université Victor Segalen"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
new file mode 100644
index 0000000000..bff1832a8f
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -0,0 +1,125 @@
+Instance: pp19dr-practitioner
+InstanceOf: AsDrPractitionerProfile
+Usage: #example
+// Basé sur le fichier tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\Practitioner_PP19.json
+
+// Identifiant technique
+* id = "334081"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "urn:oid:1.2.250.1.71.4.2.1"
+ * use = #official
+ * value = "810003461033"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #IDNPS
+* identifier[+]
+ * system = "http://rpps.fr"
+ * use = #official
+ * value = "10003461033"
+ * type
+ * coding[+]
+ * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * code = #RPPS
+
+// Nom
+* name[+]
+ * prefix = "M"
+ * use = #usual
+* name[+]
+ * prefix = "M"
+ * use = #official
+ * family = "BONNET"
+ * given[+] = "Jerome"
+
+// Genre
+* gender = #male
+
+// Date de naissance
+* birthDate = "1995-01-08"
+
+// Langage
+* language = #fr
+
+// Communication
+* communication[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G00-Langue/FHIR/TRE-G00-Langue"
+ * code = #fr
+
+// Adresse
+* address[+]
+ * city = "92140 CLAMART"
+ * postalCode = "92140"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #92023
+ * line[+]
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
+ * valueString = "79"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+ * valueString = "AV"
+ * extension[+]
+ * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+ * valueString = "HENRI BARBUSSE"
+
+// Télécommunication
+* telecom[+]
+ * system = #phone
+ * value = "0603590791"
+ * rank = 1
+* telecom[+]
+ * system = #email
+ * value = "jeromebonnet@hotmail.fr"
+
+// Qualification
+* qualification[+]
+ * code
+ * coding[degreeR48]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
+ * code = #DE05
+ * coding[degreeType]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
+ * code = #DE
+ * period.start = "2019-03-10"
+ * issuer = Reference(Organization/u33)
+
+
+// Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+// Lieu de naissance
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
+ * valueAddress
+ * text = "NANTES"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #44109
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
new file mode 100644
index 0000000000..e63e9d5559
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
@@ -0,0 +1,94 @@
+Instance: pp19dr-practitioner-role-lib
+InstanceOf: AsDrPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers :
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\professionalRole_ExePro_PP19.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\organizationalRole_SituExe_PP19.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "1738459"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "1010399870"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/334081)
+
+// Lien EJ
+* organization = Reference(Organization/548812)
+
+// Période
+* period
+ * start = "2019-09-03"
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #10
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #L
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "BONNET"
+ * given[+] = "Jerome"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOM
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-10"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-30"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
new file mode 100644
index 0000000000..137773231e
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
@@ -0,0 +1,94 @@
+Instance: pp19dr-practitioner-role-sal
+InstanceOf: AsDrPractitionerRoleProfile
+Usage: #example
+// Basé sur les fichiers
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\professionalRole_ExePro_PP19.json
+// tests-Platines-rass\Services_delta_donnees_actives\lot_complet\detail_jdd\7-Full_jour5\PP\PP19\organizationalRole_SituExe_PP19.json --> modif : organization.identifier.value
+
+// Identifiant technique
+* id = "1578230"
+
+// Métadonnées
+* meta
+ * versionId = "0.1"
+ * source = "https://annuaire.sante.fr"
+ * lastUpdated = "2019-09-05T01:00:00.000+01:00"
+ * profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitionerrole"
+
+// Actif
+* active = true
+
+// Identifiant fonctionnel
+* identifier[+]
+ * system = "https://annuaire.sante.fr"
+ * value = "F58000880311022013"
+
+// Lien professionnel
+* practitioner = Reference(Practitioner/334081)
+
+// Lien EG
+* organization = Reference(Organization/158480)
+
+// Période
+* period
+ * start = "2019-06-30"
+
+// Code
+* code[+]
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
+ * code = #10
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
+ * code = #C
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
+ * code = #GENR01
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
+ * code = #S
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
+ * code = #FON-AU
+
+// Langage
+* language = #fr
+
+// Nom
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
+ * valueHumanName
+ * family = "BONNET"
+ * given[+] = "Jerome"
+
+// Enregistrement
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOM
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-10"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-30"
\ No newline at end of file
diff --git a/input/fsh/examples/PP15-Practitioner.fsh b/input/fsh/examples/PP15-Practitioner.fsh
deleted file mode 100644
index 6c5bb592ea..0000000000
--- a/input/fsh/examples/PP15-Practitioner.fsh
+++ /dev/null
@@ -1,52 +0,0 @@
-Instance: pp15-practitioner
-InstanceOf: AsDrPractitionerProfile
-Usage: #example
-
-//Identifiant technique
-* id = "1586981"
-
-//Metadata
-* meta.versionId = "0.1"
-* meta.source = "https://annuaire.sante.fr"
-* meta.lastUpdated = "2019-08-31T01:00:00.000+01:00"
-* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
-
-//Active
-* active = true
-
-//Nom
-* name[+].prefix = "MME"
-* name[=].use = #usual
-* name[+].prefix = "MME"
-* name[=].use = #official
-* name[=].family = "MOREL"
-* name[=].given = "Victoire"
-
-//Qualification
-
-* qualification[+].code.coding[degreeR48].system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
-* qualification[=].code.coding[degreeR48].code = #DE05
-* qualification[=].period.start = "2018-06-15"
-
-* qualification[+].code.coding[degreeR50].system = "https://mos.esante.gouv.fr/NOS/TRE_R50-DESCGroupe1Diplome/FHIR/TRE-R50-DESCGroupe1Diplome"
-* qualification[=].code.coding[degreeR50].code = #DSM220
-* qualification[=].period.start = "2018-06-29"
-
-* qualification[+].code.coding[degreeR49].system = "https://mos.esante.gouv.fr/NOS/TRE_R49-DiplomeEtudeSpecialisee/FHIR/TRE-R49-DiplomeEtudeSpecialisee"
-* qualification[=].code.coding[degreeR49].code = #DSM24
-* qualification[=].period.start = "2018-06-15"
-
-* qualification[+].code.coding[degreeR49].system = "https://mos.esante.gouv.fr/NOS/TRE_R49-DiplomeEtudeSpecialisee/FHIR/TRE-R49-DiplomeEtudeSpecialisee"
-* qualification[=].code.coding[degreeR49].code = #DSM24
-* qualification[=].period.start = "2018-06-15"
-
-//Extension nationality
-* extension[+].url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
-* extension[=].extension[+].url = "code"
-* extension[=].extension[=].valueCodeableConcept.coding = https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays#99100
-
-//Extension birthPlace
-* extension[+].url = "https://apifhir.annuaire.sante.fr/exposed/structuredefinition/practitioner-birthPlace"
-* extension[=].valueAddress.text = "BORDEAUX"
-* extension[=].valueAddress.extension[+].url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
-* extension[=].valueAddress.extension[=].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R13-CommuneOM/FHIR/TRE-R13-CommuneOM#33063
\ No newline at end of file
diff --git a/input/fsh/examples/PP16-Practitioner.fsh b/input/fsh/examples/PP16-Practitioner.fsh
deleted file mode 100644
index 67b9fcc75b..0000000000
--- a/input/fsh/examples/PP16-Practitioner.fsh
+++ /dev/null
@@ -1,36 +0,0 @@
-Instance: pp16-practitioner
-InstanceOf: AsDrPractitionerProfile
-Usage: #example
-
-//Identifiant technique
-* id = "3719500"
-
-//Metadata
-* meta.versionId = "0.1"
-* meta.source = "https://annuaire.sante.fr"
-* meta.lastUpdated = "2019-08-31T01:00:00.000+01:00"
-* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
-
-//Active
-* active = true
-
-//Nom
-* name[+].prefix = "M"
-* name[=].use = #usual
-
-* name[+].prefix = "M"
-* name[=].use = #official
-* name[=].family = "CHATELIER"
-* name[=].given = "David"
-
-//Qualification
-* qualification[+].code.coding[degreeR48].system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
-* qualification[=].code.coding[degreeR48].code = #DE01
-* qualification[=].period.start = "2019-01-08"
-
-//Extension nationality
-* extension[+].url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
-* extension[=].extension[+].url = "code"
-* extension[=].extension[=].valueCodeableConcept.coding = https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays#99100
-
-
diff --git a/input/images/exemples.svg b/input/images/exemples.svg
new file mode 100644
index 0000000000..2e1d41fa6d
--- /dev/null
+++ b/input/images/exemples.svg
@@ -0,0 +1,51 @@
+@startuml
+
+/'PP15 - Medecin'/
+package PP19 <>{
+ object "Professionnel" as P19 #f6927c
+ object "Exercice Professionnel - Médecin \n + \n Situation Exercice - Libéral" as Liberal #f1dbd6
+ object "Exercice Professionnel - Médecin \n + \n Situation Exercice - Salarié" as Salarie #f1dbd6
+}
+
+P19 <|--- Liberal
+P19 <|--- Salarie
+
+/'Organisation - Hopital'/
+package PM1 <>{
+ object "Entité Géographique - \n Centre Hospitalier" as Hopital #9fd8ec
+}
+
+Salarie --|> Hopital
+
+/'Organisation - Cabinet Libéral'/
+package PM7 <>{
+ object "Entité Juridique -\n Cabinet Libéral" as Cabinet #9fd8ec
+}
+
+
+Liberal --|> Cabinet
+
+
+/'PP16 - Pharmacien'/
+package PP16 <>{
+ object "Professionnel" as P16 #f6927c
+ object "Exercice Professionnel - Pharmacien \n + \n Situation Exercice - Officine" as Pharmacien #f1dbd6
+}
+
+P16 <|-- Pharmacien
+
+/'Organisation - Officine'/
+package PM2 <>{
+ object "Entite Juridique - Officine" as Officine #9fd8ec
+}
+
+Pharmacien --|> Officine
+
+
+package "Légende" <>{
+ object Practitioner #f6927c
+ object PractitionerRole #f1dbd6
+ object Organization #9fd8ec
+}
+
+ @enduml
\ No newline at end of file
diff --git a/input/pagecontent/example.md b/input/pagecontent/example.md
new file mode 100644
index 0000000000..e69de29bb2
From 3b8b378078700e7f0d1454eed3710695f319338a Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:08:56 +0200
Subject: [PATCH 03/27] add example
---
.github/workflows/release.yml | 2 +-
input/fsh/examples/AsOrganizationExample.fsh | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 input/fsh/examples/AsOrganizationExample.fsh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fef473c211..2dd065060e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,4 +21,4 @@ jobs:
validator_cli: "true"
publish_repo: "ansforge/IG-website-release"
publish_repo_token : ${{ secrets.ANS_IG_API_TOKEN }}
- publish_path_outpout : "./IG-website-release/www/ig/fhir"
+ publish_path_outpout : "./IG-website-release/www/ig/fhir"
\ No newline at end of file
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExample.fsh
new file mode 100644
index 0000000000..03a0b75051
--- /dev/null
+++ b/input/fsh/examples/AsOrganizationExample.fsh
@@ -0,0 +1,9 @@
+Instance: organization-1
+InstanceOf: AsOrganizationProfile
+* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-organization"
+
+* identifier[idNatSt].use = #official
+* identifier[idNatSt].type = http://interopsante.org/CodeSystem/fr-v2-0203#IDNST //Have to be chaned to the new url type
+* identifier[idNatSt].system = "urn:oid:1.2.250.1.71.4.2.2"
+* identifier[idNatSt].value = "1540002698"
+* active = true
\ No newline at end of file
From 195cfedb3abb14b2f405daf3d5dcf46ba714f7af Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:22:33 +0200
Subject: [PATCH 04/27] update example
---
input/fsh/examples/AsOrganizationExample.fsh | 32 +++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExample.fsh
index 03a0b75051..01cd44b6ca 100644
--- a/input/fsh/examples/AsOrganizationExample.fsh
+++ b/input/fsh/examples/AsOrganizationExample.fsh
@@ -6,4 +6,34 @@ InstanceOf: AsOrganizationProfile
* identifier[idNatSt].type = http://interopsante.org/CodeSystem/fr-v2-0203#IDNST //Have to be chaned to the new url type
* identifier[idNatSt].system = "urn:oid:1.2.250.1.71.4.2.2"
* identifier[idNatSt].value = "1540002698"
-* active = true
\ No newline at end of file
+
+* identifier[finess].type = http://interopsante.org/CodeSystem/fr-v2-0203#FINEG
+* identifier[finess].system = "http://finess.esante.gouv.fr"
+* identifier[finess].value = "540002698"
+
+
+* active = true
+
+* name = "CHRU NANCY - HOPITAUX DE BRABOIS"
+
+* address.city = "VANDOEUVRE LES NANCY CEDEX"
+* address.postalCode = "54511"
+* address.district = "52"
+* address.extension[0].url = "https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-address-insee-code"
+* address.extension[0].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune#54547
+
+* address.line.extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+* address.line.extension[0].valueString = "R"
+
+* address.line.extension[1].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+* address.line.extension[1]..valueString = "DU MORVAN"
+
+* telecom[0].system = "phone"
+* telecom[0].value = "0383153030"
+* telecom[0].rank = 1
+
+* telecom[1].system = "fax"
+* telecom[1].value = "0383153522"
+
+* telecom[2].system = "email"
+* telecom[2].value = "direction.generale@chu-nancy.fr"
\ No newline at end of file
From 9afa2240dc65127d619b687e76aa75d4edf4674e Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:59:13 +0200
Subject: [PATCH 05/27] fix code
---
input/fsh/examples/AsOrganizationExample.fsh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExample.fsh
index 01cd44b6ca..9c85054dcb 100644
--- a/input/fsh/examples/AsOrganizationExample.fsh
+++ b/input/fsh/examples/AsOrganizationExample.fsh
@@ -28,12 +28,12 @@ InstanceOf: AsOrganizationProfile
* address.line.extension[1].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* address.line.extension[1]..valueString = "DU MORVAN"
-* telecom[0].system = "phone"
+* telecom[0].system = #phone
* telecom[0].value = "0383153030"
* telecom[0].rank = 1
-* telecom[1].system = "fax"
+* telecom[1].system = #fax
* telecom[1].value = "0383153522"
-* telecom[2].system = "email"
+* telecom[2].system = #email
* telecom[2].value = "direction.generale@chu-nancy.fr"
\ No newline at end of file
From 9b9a6b782597ea48c004e11dce9f0133d37c4cc5 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:59:32 +0200
Subject: [PATCH 06/27] change name
---
input/fsh/examples/AsOrganizationExample.fsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExample.fsh
index 9c85054dcb..64deb273f8 100644
--- a/input/fsh/examples/AsOrganizationExample.fsh
+++ b/input/fsh/examples/AsOrganizationExample.fsh
@@ -1,4 +1,4 @@
-Instance: organization-1
+Instance: example-organization-nancy
InstanceOf: AsOrganizationProfile
* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-organization"
From a2741a63c97cede0b4cf4d4badccb090274f8a9d Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 11:12:11 +0200
Subject: [PATCH 07/27] update
---
input/fsh/examples/AsOrganizationExample.fsh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExample.fsh
index 64deb273f8..aea56d648c 100644
--- a/input/fsh/examples/AsOrganizationExample.fsh
+++ b/input/fsh/examples/AsOrganizationExample.fsh
@@ -22,6 +22,8 @@ InstanceOf: AsOrganizationProfile
* address.extension[0].url = "https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-address-insee-code"
* address.extension[0].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune#54547
+
+* address.line = "R DU MORVAN, 54511 VANDOEUVRE LES NANCY CEDEX"
* address.line.extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* address.line.extension[0].valueString = "R"
From bdbcd94c080e6995d6abf121cb3c1abc2288b726 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Wed, 10 Apr 2024 11:16:16 +0200
Subject: [PATCH 08/27] ajout-hopital-fictif
---
.../examples/AsOrganizationExampleFictive.fsh | 42 +++++++++++++++++++
...ple.fsh => AsOrganizationExampleNancy.fsh} | 0
2 files changed, 42 insertions(+)
create mode 100644 input/fsh/examples/AsOrganizationExampleFictive.fsh
rename input/fsh/examples/{AsOrganizationExample.fsh => AsOrganizationExampleNancy.fsh} (100%)
diff --git a/input/fsh/examples/AsOrganizationExampleFictive.fsh b/input/fsh/examples/AsOrganizationExampleFictive.fsh
new file mode 100644
index 0000000000..10cdf14acd
--- /dev/null
+++ b/input/fsh/examples/AsOrganizationExampleFictive.fsh
@@ -0,0 +1,42 @@
+Instance: example-organization-fictive
+InstanceOf: AsOrganizationProfile
+* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-organization"
+
+* identifier[idNatSt].use = #official
+* identifier[idNatSt].type = http://interopsante.org/CodeSystem/fr-v2-0203#IDNST //Have to be chaned to the new url type
+* identifier[idNatSt].system = "urn:oid:1.2.250.1.71.4.2.2"
+* identifier[idNatSt].value = "1458174839"
+
+* identifier[finess].type = http://interopsante.org/CodeSystem/fr-v2-0203#FINEG
+* identifier[finess].system = "http://finess.esante.gouv.fr"
+* identifier[finess].value = "5458174839"
+
+
+* active = true
+
+* name = "Hôpital fictif"
+* alias = "Hôpital fictif pour le guide d'implémentation de l'annuaire"
+
+* address.city = "BOURGES"
+* address.postalCode = "18000"
+* address.district = "18"
+
+* address.extension[0].url = "https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-address-insee-code"
+* address.extension[0].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune#18000
+
+* address.line = "R DE LA LIBERTE, 18000 BOURGES"
+* address.line.extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
+* address.line.extension[0].valueString = "R"
+
+* address.line.extension[1].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
+* address.line.extension[1]..valueString = "DE LA LIBERTE"
+
+* telecom[0].system = #phone
+* telecom[0].value = "0248391028"
+* telecom[0].rank = 1
+
+* telecom[1].system = #fax
+* telecom[1].value = "0248391029"
+
+* telecom[2].system = #email
+* telecom[2].value = "direction@hopital-fictif.fr"
\ No newline at end of file
diff --git a/input/fsh/examples/AsOrganizationExample.fsh b/input/fsh/examples/AsOrganizationExampleNancy.fsh
similarity index 100%
rename from input/fsh/examples/AsOrganizationExample.fsh
rename to input/fsh/examples/AsOrganizationExampleNancy.fsh
From ff01a0acd983288e01e6f0fa05980add945ac733 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:43:01 +0200
Subject: [PATCH 09/27] update examples
---
.../examples/AsOrganizationExampleFictive.fsh | 2 +-
input/fsh/examples/DP/PP16DP-Organization.fsh | 12 +--
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 10 +--
.../examples/DP/PP19DP-Organization-EG-CH.fsh | 12 +--
.../DP/PP19DP-Organization-EJ-Cab.fsh | 10 +--
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 4 +-
input/fsh/examples/DR/PP16DR-Organization.fsh | 12 +--
input/fsh/examples/DR/PP16DR-Person.fsh | 30 ++++++++
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 76 +++++++++++--------
.../examples/DR/PP16DR-PractitionerRole.fsh | 39 ----------
.../examples/DR/PP19DR-Organization-EG-CH.fsh | 12 +--
.../DR/PP19DR-Organization-EJ-Cab.fsh | 8 +-
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 9 +--
sushi-config.yaml | 2 +-
14 files changed, 119 insertions(+), 119 deletions(-)
create mode 100644 input/fsh/examples/DR/PP16DR-Person.fsh
diff --git a/input/fsh/examples/AsOrganizationExampleFictive.fsh b/input/fsh/examples/AsOrganizationExampleFictive.fsh
index 10cdf14acd..3a45bc413d 100644
--- a/input/fsh/examples/AsOrganizationExampleFictive.fsh
+++ b/input/fsh/examples/AsOrganizationExampleFictive.fsh
@@ -9,7 +9,7 @@ InstanceOf: AsOrganizationProfile
* identifier[finess].type = http://interopsante.org/CodeSystem/fr-v2-0203#FINEG
* identifier[finess].system = "http://finess.esante.gouv.fr"
-* identifier[finess].value = "5458174839"
+* identifier[finess].value = "458174839"
* active = true
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
index c428a2bcb4..501f3b5b9f 100644
--- a/input/fsh/examples/DP/PP16DP-Organization.fsh
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -23,23 +23,23 @@ Usage: #example
* value = "1580008803"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
* identifier[+][finess]
- * system = "http://finess.esante.gouv.fr"
+ * system = "https://finess.esante.gouv.fr"
* use = #official
* value = "580008803"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #FINEJ
-* identifier[+][adeliRpps]
- * system = "https://annuaire.sante.fr"
+* identifier[+][rppsRang]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "F58000880311022013"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index 1bebb17be4..e963005db9 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -23,15 +23,15 @@ Usage: #example
* value = "810102727017"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
* identifier[rpps][+]
- * system = "http://rpps.fr"
+ * system = "https://rpps.esante.gouv.fr"
* use = #official
* value = "10102727017"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #RPPS
// Nom
@@ -51,9 +51,9 @@ Usage: #example
* value = "davidchatelier@orange.fr"
// Qualification
-* qualification[+]
+* qualification[degree][+]
* code
- * coding[+][degreeR48]
+ * coding[+][degree]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
* code = #DE01
* coding[+][degreeType]
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
index 5a16bdb846..2574ca8789 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -23,23 +23,23 @@ Usage: #example
* value = "1754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
* identifier[+][finess]
- * system = "http://finess.esante.gouv.fr"
+ * system = "https://finess.esante.gouv.fr"
* use = #official
* value = "754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #FINEG
-* identifier[adeliRpps][+]
- * system = "https://annuaire.sante.fr"
+* identifier[rppsRang][+]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "F754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
index 6a4f2e6960..0bb41d45bc 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
@@ -23,15 +23,15 @@ Usage: #example
* value = "410005531586003"
* type
* coding[+]
- * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
-* identifier[adeliRpps][+]
- * system = "https://annuaire.sante.fr"
+* identifier[rppsRang][+]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
- * value = "REJ10000000800887"
+ * value = "https://rppsrang.esante.gouv.fr"
* type
* coding[+]
- * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index 6d028fa658..04339bc9c3 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -51,9 +51,9 @@ Usage: #example
* value = "jeromebonnet@hotmail.fr"
// Qualification
-* qualification[+]
+* qualification[degree][+]
* code
- * coding[degreeR48]
+ * coding[degree]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
* code = #DE05
* coding[degreeType]
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 28cd76ec41..a4a2c86b74 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -23,23 +23,23 @@ Usage: #example
* value = "1580008803"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
* identifier[+][finess]
- * system = "http://finess.esante.gouv.fr"
+ * system = "https://finess.esante.gouv.fr"
* use = #official
* value = "580008803"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #FINEJ
-* identifier[+][adeliRpps]
- * system = "https://annuaire.sante.fr"
+* identifier[+][rppsRang]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "F58000880311022013"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DR/PP16DR-Person.fsh b/input/fsh/examples/DR/PP16DR-Person.fsh
new file mode 100644
index 0000000000..64e946017b
--- /dev/null
+++ b/input/fsh/examples/DR/PP16DR-Person.fsh
@@ -0,0 +1,30 @@
+Instance: pp16dr-person
+InstanceOf: as-dr-person
+Usage: #example
+* name[+]
+ * prefix = "M"
+ * use = #official
+ * family = "CHATELIER"
+ * given[+] = "David"
+
+ // Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+// Lieu de naissance
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-birth-place"
+ * valueAddress
+ * text = "COSNE-COURS-SUR-LOIRE"
+ * country = "99100"
+ * extension[+]
+ * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #58086
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index e304e5784b..27b07487b2 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -13,6 +13,40 @@ Usage: #example
* lastUpdated = "2019-08-31T01:00:00.000+01:00"
* profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
+
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = true
+ * extension[+]
+ * url = "registeringOrganization"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOP
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-registration"
+ * extension[+]
+ * url = "isFirst"
+ * valueBoolean = false
+ * extension[+]
+ * url = "status"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[+]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-01-15"
+
+
+
// Actif
* active = true
@@ -23,27 +57,23 @@ Usage: #example
* value = "810102727017"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
* identifier[rpps][+]
- * system = "http://rpps.fr"
+ * system = "https://rpps.esante.gouv.fr"
* use = #official
* value = "10102727017"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #RPPS
-// Nom
+// Nom d'usage (exercice pro)
* name[+]
* prefix = "M"
* use = #usual
-* name[+]
- * prefix = "M"
- * use = #official
* family = "CHATELIER"
* given[+] = "David"
-
// Genre
* gender = #male
@@ -59,7 +89,7 @@ Usage: #example
* system = "https://mos.esante.gouv.fr/NOS/TRE_G00-Langue/FHIR/TRE-G00-Langue"
* code = #fr
-// Adresse
+// Adresse de correspondance
* address[+]
* city = "58400 LA-CHARITE-SUR-LOIRE"
* postalCode = "58400"
@@ -88,11 +118,12 @@ Usage: #example
* telecom[+]
* system = #email
* value = "davidchatelier@orange.fr"
+ // TODO : Ajouter telecom[maiboxmss]
// Qualification
-* qualification[+]
+* qualification[degree][0]
* code
- * coding[+][degreeR48]
+ * coding[+][degree]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
* code = #DE01
* coding[+][degreeType]
@@ -102,24 +133,5 @@ Usage: #example
* start = "2019-01-08"
* issuer = Reference(Organization/u63)
-// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
- * extension[+]
- * url = "code"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
- * code = #99100
-
-// Lieu de naissance
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
- * valueAddress
- * text = "COSNE-COURS-SUR-LOIRE"
- * country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
- * valueCoding
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
- * code = #58086
\ No newline at end of file
+
+
diff --git a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
index 6126989a9e..e18570e273 100644
--- a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
+++ b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
@@ -53,42 +53,3 @@ Usage: #example
// Langage
* language = #fr
-
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "CHATELIER"
- * given[+] = "David"
-
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOP
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-01-15"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index ad6b13c0fa..8046b69674 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -23,23 +23,23 @@ Usage: #example
* value = "1754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
* identifier[+][finess]
- * system = "http://finess.esante.gouv.fr"
+ * system = "https://finess.esante.gouv.fr"
* use = #official
* value = "754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #FINEG
-* identifier[adeliRpps][+]
- * system = "https://annuaire.sante.fr"
+* identifier[rppsRang][+]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "F754567860"
* type
* coding[+]
- * system = "http://interopsante.org/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
index caac105518..fe0f77760f 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -23,15 +23,15 @@ Usage: #example
* value = "410005531586003"
* type
* coding[+]
- * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
-* identifier[adeliRpps][+]
- * system = "https://annuaire.sante.fr"
+* identifier[rppsRang][+]
+ * system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "REJ10000000800887"
* type
* coding[+]
- * system = "https://simplifier.net/FrenchProfiledFHIRAr/fr-organization-identifier-type"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
// Nom
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index bff1832a8f..1a92fee73a 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -34,13 +34,10 @@ Usage: #example
* system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
* code = #RPPS
-// Nom
+// Nom d'usage (officiel dans Person)
* name[+]
* prefix = "M"
* use = #usual
-* name[+]
- * prefix = "M"
- * use = #official
* family = "BONNET"
* given[+] = "Jerome"
@@ -90,9 +87,9 @@ Usage: #example
* value = "jeromebonnet@hotmail.fr"
// Qualification
-* qualification[+]
+* qualification[degree][+]
* code
- * coding[degreeR48]
+ * coding[degree]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
* code = #DE05
* coding[degreeType]
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 9a07fae09f..d245152ec2 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -10,7 +10,7 @@ publisher:
url: https://esante.gouv.fr
email: monserviceclient.annuaire@esante.gouv.fr
dependencies:
- hl7.fhir.fr.core: 2.0.0
+ hl7.fhir.fr.core: 2.0.1
hl7.fhir.extensions.r5: 4.0.1
ans.fr.nos: latest
status: active
From 5b111255ac258d96f0ab50e7b44cea54c4a772aa Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:46:07 +0200
Subject: [PATCH 10/27] correct URLs
---
input/fsh/examples/AsOrganizationExampleFictive.fsh | 6 +++---
input/fsh/examples/AsOrganizationExampleNancy.fsh | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/input/fsh/examples/AsOrganizationExampleFictive.fsh b/input/fsh/examples/AsOrganizationExampleFictive.fsh
index 3a45bc413d..ea4f0e4da7 100644
--- a/input/fsh/examples/AsOrganizationExampleFictive.fsh
+++ b/input/fsh/examples/AsOrganizationExampleFictive.fsh
@@ -3,12 +3,12 @@ InstanceOf: AsOrganizationProfile
* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-organization"
* identifier[idNatSt].use = #official
-* identifier[idNatSt].type = http://interopsante.org/CodeSystem/fr-v2-0203#IDNST //Have to be chaned to the new url type
+* identifier[idNatSt].type = https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203#IDNST
* identifier[idNatSt].system = "urn:oid:1.2.250.1.71.4.2.2"
* identifier[idNatSt].value = "1458174839"
-* identifier[finess].type = http://interopsante.org/CodeSystem/fr-v2-0203#FINEG
-* identifier[finess].system = "http://finess.esante.gouv.fr"
+* identifier[finess].type = https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203#FINEG
+* identifier[finess].system = "https://finess.esante.gouv.fr"
* identifier[finess].value = "458174839"
diff --git a/input/fsh/examples/AsOrganizationExampleNancy.fsh b/input/fsh/examples/AsOrganizationExampleNancy.fsh
index aea56d648c..e830a93c86 100644
--- a/input/fsh/examples/AsOrganizationExampleNancy.fsh
+++ b/input/fsh/examples/AsOrganizationExampleNancy.fsh
@@ -3,12 +3,12 @@ InstanceOf: AsOrganizationProfile
* meta.profile = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-organization"
* identifier[idNatSt].use = #official
-* identifier[idNatSt].type = http://interopsante.org/CodeSystem/fr-v2-0203#IDNST //Have to be chaned to the new url type
+* identifier[idNatSt].type = https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203#IDNST
* identifier[idNatSt].system = "urn:oid:1.2.250.1.71.4.2.2"
* identifier[idNatSt].value = "1540002698"
-* identifier[finess].type = http://interopsante.org/CodeSystem/fr-v2-0203#FINEG
-* identifier[finess].system = "http://finess.esante.gouv.fr"
+* identifier[finess].type = https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203#FINEG
+* identifier[finess].system = "https://finess.esante.gouv.fr"
* identifier[finess].value = "540002698"
From f7ea7e4d6d700e3501118d718ba5795b74845551 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Mon, 3 Jun 2024 18:19:21 +0200
Subject: [PATCH 11/27] update prac
---
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index e963005db9..5f4694cfa8 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -42,6 +42,10 @@ Usage: #example
* language = #fr
// Télécommunication
+* telecom[mailbox-mss][+]
+ * system = #email
+ * value = "davidchatelier@xxx.mssante.fr"
+ * rank = 1
* telecom[+]
* system = #phone
* value = "0612122216"
From 478b5e112bae2c9efb8746c1e223ad7f2ed18b58 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:19:42 +0200
Subject: [PATCH 12/27] rm interopsante old url
---
input/fsh/examples/DP/PP16DP-Organization.fsh | 2 +-
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 2 +-
input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh | 2 +-
input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh | 2 +-
input/fsh/examples/DR/PP16DR-Organization.fsh | 2 +-
input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh | 2 +-
input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
index 501f3b5b9f..c4869ac5f0 100644
--- a/input/fsh/examples/DP/PP16DP-Organization.fsh
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -51,7 +51,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index 5f4694cfa8..951b95e7fa 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -81,7 +81,7 @@ Usage: #example
* text = "COSNE-COURS-SUR-LOIRE"
* country = "99100"
* extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * url = "https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-address-insee-code"
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #58086
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
index 2574ca8789..6e15079e5b 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -51,7 +51,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
index 0bb41d45bc..56562bb42e 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
@@ -46,7 +46,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index a4a2c86b74..188860f8d3 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -51,7 +51,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index 8046b69674..2e9d007680 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -51,7 +51,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
index fe0f77760f..ed8b6a28e5 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -46,7 +46,7 @@ Usage: #example
// Type
* type[organizationType][+]
* coding
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-3307"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
* coding
From 6a867e80ca0a0b3d53cad61858d82771b74dfefd Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 09:50:28 +0200
Subject: [PATCH 13/27] update urls and extensions
---
.../examples/DP/PP19DP-Organization-EG-CH.fsh | 14 ++++++--------
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 7 +++----
input/fsh/examples/DR/PP16DR-Person.fsh | 3 +--
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 9 ++++-----
.../examples/DR/PP19DR-Organization-EG-CH.fsh | 9 ++++-----
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 16 +++++++---------
.../fsh/profiles-dp/AsDpPractitionerProfile.fsh | 2 +-
input/fsh/profiles/AsPractitionerProfile.fsh | 2 +-
8 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
index 6e15079e5b..89c076c26f 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -73,26 +73,24 @@ Usage: #example
// Adresse
* address
- * city = "75014 PARIS"
+ * city = "PARIS"
* postalCode = "75014"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #75114
* line
- * extension[+]
+ * extension[houseNumber]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* valueString = "96"
- * extension[+]
+ * extension[streetNameType]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* valueString = "R"
- * extension[+]
+ * extension[streetNameBase]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* valueString = "DIDOT"
// Période
-* extension[+]
- * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+* extension[usePeriod]
* valuePeriod
* start = "2019-06-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index 04339bc9c3..ec1ad3443c 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -23,7 +23,7 @@ Usage: #example
* value = "810003461033"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
* identifier[+]
* system = "http://rpps.fr"
@@ -31,7 +31,7 @@ Usage: #example
* value = "10003461033"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #RPPS
// Nom
@@ -76,8 +76,7 @@ Usage: #example
* valueAddress
* text = "NANTES"
* country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #44109
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Person.fsh b/input/fsh/examples/DR/PP16DR-Person.fsh
index 64e946017b..290d7f29bf 100644
--- a/input/fsh/examples/DR/PP16DR-Person.fsh
+++ b/input/fsh/examples/DR/PP16DR-Person.fsh
@@ -23,8 +23,7 @@ Usage: #example
* valueAddress
* text = "COSNE-COURS-SUR-LOIRE"
* country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #58086
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index 27b07487b2..9e4b2aac98 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -94,19 +94,18 @@ Usage: #example
* city = "58400 LA-CHARITE-SUR-LOIRE"
* postalCode = "58400"
* country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #58059
* line[+]
- * extension[+]
+ * extension[houseNumber]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* valueString = "10"
- * extension[+]
+ * extension[streetNameType]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* valueString = "PL"
- * extension[+]
+ * extension[streetNameBase]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* valueString = "DES PECHEURS"
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index 2e9d007680..296d773442 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -75,19 +75,18 @@ Usage: #example
* address
* city = "75014 PARIS"
* postalCode = "75014"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #75114
* line
- * extension[+]
+ * extension[houseNumber]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* valueString = "96"
- * extension[+]
+ * extension[streetNameType]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* valueString = "R"
- * extension[+]
+ * extension[streetNameBase]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* valueString = "DIDOT"
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index 1a92fee73a..edebcd4c40 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -23,7 +23,7 @@ Usage: #example
* value = "810003461033"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
* identifier[+]
* system = "http://rpps.fr"
@@ -31,7 +31,7 @@ Usage: #example
* value = "10003461033"
* type
* coding[+]
- * system = "http://interopsante.org/fhir/CodeSystem/fr-v2-0203"
+ * system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #RPPS
// Nom d'usage (officiel dans Person)
@@ -61,19 +61,18 @@ Usage: #example
* city = "92140 CLAMART"
* postalCode = "92140"
* country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #92023
* line[+]
- * extension[+]
+ * extension[houseNumber]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* valueString = "79"
- * extension[+]
+ * extension[streetNameType]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* valueString = "AV"
- * extension[+]
+ * extension[streetNameBase]
* url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* valueString = "HENRI BARBUSSE"
@@ -115,8 +114,7 @@ Usage: #example
* valueAddress
* text = "NANTES"
* country = "99100"
- * extension[+]
- * url = "http://interopsante.org/fhir/StructureDefinition/FrAddressInseeCode"
+ * extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
* code = #44109
\ No newline at end of file
diff --git a/input/fsh/profiles-dp/AsDpPractitionerProfile.fsh b/input/fsh/profiles-dp/AsDpPractitionerProfile.fsh
index 1a42453013..9951f01165 100644
--- a/input/fsh/profiles-dp/AsDpPractitionerProfile.fsh
+++ b/input/fsh/profiles-dp/AsDpPractitionerProfile.fsh
@@ -17,7 +17,7 @@ Description: "Profil public applicatif créé à partir du profil générique a
* identifier[identifiantInterne].system from as-vs-intern-id-systems (required)
* identifier[identifiantInterne].system ^short = "Système de l'identifiant parmi les valeurs : finess.local.esante.gouv.fr | siren.local.esante.gouv.fr | siret.local.esante.gouv.fr | rpps.local.esante.gouv.fr | adeli.local.esante.gouv.fr"
* identifier[identifiantInterne].value ^short = "Valeur de l'identifiant au format xxxxx/yyyyy où xxxxx est l'identifiant finess/siren/siret/rpps/adeli et yyyyy l'identifiant local."
-* identifier[identifiantInterne].type = http://interopsante.org/fhir/CodeSystem/fr-v2-0203#INTRN
+* identifier[identifiantInterne].type = https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203#INTRN
// active
* active 1..1 // 'true' par défaut, 'false' pour notifier aux clients du mode delta les practitioner supprimées entre 2 dates, dans ce cas seuls l'id et le champs active sont renseignés.
diff --git a/input/fsh/profiles/AsPractitionerProfile.fsh b/input/fsh/profiles/AsPractitionerProfile.fsh
index 18567a3cde..7ff0c73338 100644
--- a/input/fsh/profiles/AsPractitionerProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerProfile.fsh
@@ -23,7 +23,7 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
/* Practitioner.identifier */
// Defined in FrCore
-* identifier.type ^short = "Type d’identifiant national de la personne physique (typeIdNat_PP),\r\nLes codes ADELI, RPPS et IDNPS proviennent du system http://interopsante.org/fhir/CodeSystem/fr-v2-0203 ; Les codes 1, 3, 4, 5, 6 proviennent du system : https://mos.esante.gouv.fr/NOS/TRE_G08-TypeIdentifiantPersonne/FHIR/TRE-G08-TypeIdentifiantPersonne"
+* identifier.type ^short = "Type d’identifiant national de la personne physique (typeIdNat_PP),\r\nLes codes ADELI, RPPS et IDNPS proviennent du system https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203 ; Les codes 1, 3, 4, 5, 6 proviennent du system : https://mos.esante.gouv.fr/NOS/TRE_G08-TypeIdentifiantPersonne/FHIR/TRE-G08-TypeIdentifiantPersonne"
* identifier[idNatPs] MS
From c848d1d88c712dcad19ec60fa64e8c03e1c27c27 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:19:00 +0200
Subject: [PATCH 14/27] update resources
---
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 4 ++
.../examples/DP/PP16DP-PractitionerRole.fsh | 6 --
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 19 ++-----
.../DP/PP19DP-PractitionerRole-Lib.fsh | 41 +------------
.../DP/PP19DP-PractitionerRole-Sal.fsh | 41 +------------
input/fsh/examples/DR/PP16DR-Person.fsh | 8 ++-
input/fsh/examples/DR/PP19DR-Person.fsh | 42 ++++++++++++++
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 57 +++++++++++--------
.../DR/PP19DR-PractitionerRole-Lib.fsh | 41 +------------
.../DR/PP19DR-PractitionerRole-Sal.fsh | 41 +------------
10 files changed, 94 insertions(+), 206 deletions(-)
create mode 100644 input/fsh/examples/DR/PP19DR-Person.fsh
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index 951b95e7fa..1fb362db9d 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -37,6 +37,10 @@ Usage: #example
// Nom
* name[+]
* prefix = "M"
+ * use = #usual
+ * family = "CHATELIER"
+ * given[+] = "David"
+
// Langage
* language = #fr
diff --git a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
index ac6d5122cf..8ab96f88ad 100644
--- a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
+++ b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
@@ -50,12 +50,6 @@ Usage: #example
// Langage
* language = #fr
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "CHATELIER"
- * given[+] = "David"
// Enregistrement
* extension[+]
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index ec1ad3443c..33f5d7a48d 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -17,7 +17,7 @@ Usage: #example
* active = true
// Identifiant fonctionnel
-* identifier[+]
+* identifier[idNatPs]
* system = "urn:oid:1.2.250.1.71.4.2.1"
* use = #official
* value = "810003461033"
@@ -25,8 +25,8 @@ Usage: #example
* coding[+]
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
-* identifier[+]
- * system = "http://rpps.fr"
+* identifier[rpps]
+ * system = "https://rpps.esante.gouv.fr"
* use = #official
* value = "10003461033"
* type
@@ -37,6 +37,9 @@ Usage: #example
// Nom
* name[+]
* prefix = "M"
+ * use = #usual
+ * family = "Saucier"
+ * given[+] = "Arthur"
// Langage
* language = #fr
@@ -70,13 +73,3 @@ Usage: #example
* system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
* code = #99100
-// Lieu de naissance
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
- * valueAddress
- * text = "NANTES"
- * country = "99100"
- * extension[inseeCode]
- * valueCoding
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
- * code = #44109
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
index 8bf9963d29..94acacbf32 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
@@ -48,43 +48,4 @@ Usage: #example
* code = #FON-AU
// Langage
-* language = #fr
-
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "BONNET"
- * given[+] = "Jerome"
-
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOM
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-10"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-30"
\ No newline at end of file
+* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
index 83ff63e7b4..e9f85fc037 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
@@ -48,43 +48,4 @@ Usage: #example
* code = #FON-AU
// Langage
-* language = #fr
-
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "BONNET"
- * given[+] = "Jerome"
-
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOM
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-10"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-30"
\ No newline at end of file
+* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Person.fsh b/input/fsh/examples/DR/PP16DR-Person.fsh
index 290d7f29bf..bff4ea11e1 100644
--- a/input/fsh/examples/DR/PP16DR-Person.fsh
+++ b/input/fsh/examples/DR/PP16DR-Person.fsh
@@ -18,12 +18,14 @@ Usage: #example
* code = #99100
// Lieu de naissance
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-birth-place"
+* extension[as-ext-person-birth-place]
* valueAddress
* text = "COSNE-COURS-SUR-LOIRE"
* country = "99100"
* extension[inseeCode]
* valueCoding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
- * code = #58086
\ No newline at end of file
+ * code = #58086
+
+
+* link[as-practitioner-exercice-professionnel].target = Reference(pp16dp-practitioner)
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Person.fsh b/input/fsh/examples/DR/PP19DR-Person.fsh
new file mode 100644
index 0000000000..dec2feaf72
--- /dev/null
+++ b/input/fsh/examples/DR/PP19DR-Person.fsh
@@ -0,0 +1,42 @@
+Instance: pp19dr-person
+InstanceOf: as-dr-person
+Usage: #example
+* name[+]
+ * prefix = "M"
+ * use = #official
+ * family = "Saucier"
+ * given[+] = "Artus"
+
+ // Nationalité
+* extension[+]
+ * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-nationality"
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+
+// Lieu de naissance
+* extension[as-ext-person-birth-place]
+ * valueAddress
+ * text = "NANTES"
+ * country = "99100"
+ * extension[inseeCode]
+ * valueCoding
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
+ * code = #44109
+
+
+
+// Nationalité
+* extension[as-ext-person-nationality]
+ * extension[+]
+ * url = "code"
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
+ * code = #99100
+
+* link[as-practitioner-exercice-professionnel].target = Reference(pp19dp-practitioner)
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index edebcd4c40..21ab077005 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -17,7 +17,7 @@ Usage: #example
* active = true
// Identifiant fonctionnel
-* identifier[+]
+* identifier[idNatPs]
* system = "urn:oid:1.2.250.1.71.4.2.1"
* use = #official
* value = "810003461033"
@@ -25,8 +25,8 @@ Usage: #example
* coding[+]
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNPS
-* identifier[+]
- * system = "http://rpps.fr"
+* identifier[rpps]
+ * system = "https://rpps.esante.gouv.fr"
* use = #official
* value = "10003461033"
* type
@@ -34,12 +34,12 @@ Usage: #example
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #RPPS
-// Nom d'usage (officiel dans Person)
+// Nom d'usage
* name[+]
* prefix = "M"
* use = #usual
- * family = "BONNET"
- * given[+] = "Jerome"
+ * family = "Saucier"
+ * given[+] = "Arthur"
// Genre
* gender = #male
@@ -98,23 +98,32 @@ Usage: #example
* issuer = Reference(Organization/u33)
-// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
- * extension[+]
- * url = "code"
+
+
+
+
+// Enregistrement
+* extension[as-ext-registration][+]
+ * extension[isFirst]
+ * valueBoolean = true
+ * extension[registeringOrganization]
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOM
+ * extension[period]
+ * url = "period"
+ * valuePeriod
+ * start = "2019-03-10"
+
+* extension[as-ext-registration][+]
+ * extension[isFirst]
+ * valueBoolean = false
+ * extension[status]
* valueCodeableConcept
* coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
- * code = #99100
-
-// Lieu de naissance
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
- * valueAddress
- * text = "NANTES"
- * country = "99100"
- * extension[inseeCode]
- * valueCoding
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
- * code = #44109
\ No newline at end of file
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[period]
+ * valuePeriod
+ * start = "2019-03-30"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
index e63e9d5559..b7aa74ead6 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
@@ -52,43 +52,4 @@ Usage: #example
* code = #FON-AU
// Langage
-* language = #fr
-
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "BONNET"
- * given[+] = "Jerome"
-
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOM
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-10"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-30"
\ No newline at end of file
+* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
index 137773231e..8ddf517dc0 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
@@ -52,43 +52,4 @@ Usage: #example
* code = #FON-AU
// Langage
-* language = #fr
-
-// Nom
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-name"
- * valueHumanName
- * family = "BONNET"
- * given[+] = "Jerome"
-
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOM
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-10"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-03-30"
\ No newline at end of file
+* language = #fr
\ No newline at end of file
From 41eddcf257920033b91b683244446e280002bb13 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:34:09 +0200
Subject: [PATCH 15/27] update examples
---
input/fsh/examples/DP/PP16DP-Organization.fsh | 3 +-
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 41 ++++++++++---------
.../examples/DP/PP16DP-PractitionerRole.fsh | 31 --------------
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 13 +-----
input/fsh/examples/DR/PP16DR-Organization.fsh | 6 +--
.../examples/DR/PP19DR-Organization-EG-CH.fsh | 6 +--
.../DR/PP19DR-Organization-EJ-Cab.fsh | 3 +-
input/fsh/examples/DR/PP19DR-Person.fsh | 16 +-------
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 2 -
9 files changed, 31 insertions(+), 90 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
index c4869ac5f0..62791acfb9 100644
--- a/input/fsh/examples/DP/PP16DP-Organization.fsh
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -59,7 +59,6 @@ Usage: #example
* code = #SA33
// Période
-* extension[+]
- * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+* extension[usePeriod]
* valuePeriod
* start = "2019-09-02"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index 1fb362db9d..f370a25c8f 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -68,24 +68,27 @@ Usage: #example
* system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
* code = #DE
-// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
- * extension[+]
- * url = "code"
+
+// Enregistrement
+* extension[as-ext-registration]
+ * extension[isFirst]
+ * valueBoolean = true
+ * extension[registeringOrganization]
* valueCodeableConcept
* coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
- * code = #99100
-
-// Lieu de naissance
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-birth-place"
- * valueAddress
- * text = "COSNE-COURS-SUR-LOIRE"
- * country = "99100"
- * extension[+]
- * url = "https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-address-insee-code"
- * valueCoding
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R13-Commune/FHIR/TRE-R13-Commune"
- * code = #58086
\ No newline at end of file
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
+ * code = #CNOP
+ * extension[period]
+ * valuePeriod
+ * start = "2019-01-15"
+* extension[as-ext-registration]
+ * extension[isFirst]
+ * valueBoolean = false
+ * extension[status]
+ * valueCodeableConcept
+ * coding[+]
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * code = #D
+ * extension[period]
+ * valuePeriod
+ * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
index 8ab96f88ad..4996171a89 100644
--- a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
+++ b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
@@ -51,34 +51,3 @@ Usage: #example
* language = #fr
-// Enregistrement
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOP
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-01-15"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitionerrole-registration"
- * extension[+]
- * url = "isFirst"
- * valueBoolean = false
- * extension[+]
- * url = "status"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[+]
- * url = "period"
- * valuePeriod
- * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index 33f5d7a48d..4175b277de 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -61,15 +61,4 @@ Usage: #example
* code = #DE05
* coding[degreeType]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
- * code = #DE
-
-// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-practitioner-nationality"
- * extension[+]
- * url = "code"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
- * code = #99100
-
+ * code = #DE
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 188860f8d3..25babf7b8b 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -17,7 +17,7 @@ Usage: #example
* active = true
// Identifiant fonctionnel
-* identifier[+][idNatSt]
+* identifier[idNatSt]
* system = "urn:oid:1.2.250.1.71.4.2.2"
* use = #official
* value = "1580008803"
@@ -25,7 +25,7 @@ Usage: #example
* coding[+]
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #IDNST
-* identifier[+][finess]
+* identifier[finess]
* system = "https://finess.esante.gouv.fr"
* use = #official
* value = "580008803"
@@ -33,7 +33,7 @@ Usage: #example
* coding[+]
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #FINEJ
-* identifier[+][rppsRang]
+* identifier[rppsRang]
* system = "https://rppsrang.esante.gouv.fr"
* use = #official
* value = "F58000880311022013"
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index 296d773442..f0cdbc445d 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -81,17 +81,13 @@ Usage: #example
* code = #75114
* line
* extension[houseNumber]
- * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* valueString = "96"
* extension[streetNameType]
- * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameType"
* valueString = "R"
* extension[streetNameBase]
- * url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetNameBase"
* valueString = "DIDOT"
// Période
-* extension[+]
- * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+* extension[usePeriod]
* valuePeriod
* start = "2019-06-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
index ed8b6a28e5..21d47bdee4 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -54,7 +54,6 @@ Usage: #example
* code = #SA08
// Période
-* extension[+]
- * url = "http://hl7.org/fhir/StructureDefinition/organization-period"
+* extension[usePeriod]
* valuePeriod
* start = "2019-04-01"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Person.fsh b/input/fsh/examples/DR/PP19DR-Person.fsh
index dec2feaf72..0e47f9cb36 100644
--- a/input/fsh/examples/DR/PP19DR-Person.fsh
+++ b/input/fsh/examples/DR/PP19DR-Person.fsh
@@ -8,10 +8,8 @@ Usage: #example
* given[+] = "Artus"
// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-nationality"
- * extension[+]
- * url = "code"
+* extension[as-ext-person-nationality]
+ * extension[code]
* valueCodeableConcept
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
@@ -29,14 +27,4 @@ Usage: #example
* code = #44109
-
-// Nationalité
-* extension[as-ext-person-nationality]
- * extension[+]
- * url = "code"
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R20-Pays/FHIR/TRE-R20-Pays"
- * code = #99100
-
* link[as-practitioner-exercice-professionnel].target = Reference(pp19dp-practitioner)
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index 21ab077005..f9cf40e112 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -100,8 +100,6 @@ Usage: #example
-
-
// Enregistrement
* extension[as-ext-registration][+]
* extension[isFirst]
From b42aecfe1256b717ac5c29514b8d290a3257fc3c Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:42:06 +0200
Subject: [PATCH 16/27] fix examples
---
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 25 -------------------
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 24 ++++++------------
2 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index f370a25c8f..0b50b43c44 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -67,28 +67,3 @@ Usage: #example
* coding[+][degreeType]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
* code = #DE
-
-
-// Enregistrement
-* extension[as-ext-registration]
- * extension[isFirst]
- * valueBoolean = true
- * extension[registeringOrganization]
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
- * code = #CNOP
- * extension[period]
- * valuePeriod
- * start = "2019-01-15"
-* extension[as-ext-registration]
- * extension[isFirst]
- * valueBoolean = false
- * extension[status]
- * valueCodeableConcept
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
- * code = #D
- * extension[period]
- * valuePeriod
- * start = "2019-01-15"
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index 9e4b2aac98..b61ecf00bc 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -14,34 +14,26 @@ Usage: #example
* profile[+] = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-dr-practitioner"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-registration"
- * extension[+]
- * url = "isFirst"
+* extension[as-ext-registration]
+ * extension[isFirst]
* valueBoolean = true
- * extension[+]
- * url = "registeringOrganization"
+ * extension[registeringOrganization]
* valueCodeableConcept
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R60-AutoriteEnregistrement/FHIR/TRE-R60-AutoriteEnregistrement"
* code = #CNOP
- * extension[+]
- * url = "period"
+ * extension[period]
* valuePeriod
* start = "2019-01-15"
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-registration"
- * extension[+]
- * url = "isFirst"
+* extension[as-ext-registration]
+ * extension[isFirst]
* valueBoolean = false
- * extension[+]
- * url = "status"
+ * extension[status]
* valueCodeableConcept
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
* code = #D
- * extension[+]
- * url = "period"
+ * extension[period]
* valuePeriod
* start = "2019-01-15"
From 186abe053d593c96c93a87f8a59cff1069ea0ac9 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:30:19 +0200
Subject: [PATCH 17/27] update mapping
---
.../extensions/AsRegistrationExtension.fsh | 2 +-
...ealthcareServiceSocialEquipmentProfile.fsh | 36 +++++------
input/fsh/profiles/AsOrganizationProfile.fsh | 60 +++++++++----------
input/fsh/profiles/AsPersonProfile.fsh | 22 +++----
input/fsh/profiles/AsPractitionerProfile.fsh | 60 +++++++++----------
.../profiles/AsPractitionerRoleProfile.fsh | 26 ++++----
6 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/input/fsh/extensions/AsRegistrationExtension.fsh b/input/fsh/extensions/AsRegistrationExtension.fsh
index b0d1819e22..7dbb0b9d99 100644
--- a/input/fsh/extensions/AsRegistrationExtension.fsh
+++ b/input/fsh/extensions/AsRegistrationExtension.fsh
@@ -1,7 +1,7 @@
Extension: AsRegistrationExtension
Id: as-ext-registration
Title: "AS Registration Extension"
-Description: "Extension créée dans le cadre de l'Annuaire Santé pour prise en compte de la première inscription si \"isFirst = true\"."
+Description: "Extension créée dans le cadre de l'Annuaire Santé pour prise en compte de la première inscription si \"isFirst = true\". Ces données sont uniquement accessibles en accès restreint."
* ^context.type = #element
* ^context.expression = "Practitioner"
diff --git a/input/fsh/profiles/AsHealthcareServiceSocialEquipmentProfile.fsh b/input/fsh/profiles/AsHealthcareServiceSocialEquipmentProfile.fsh
index b9ff66ba35..1fc56b1af4 100644
--- a/input/fsh/profiles/AsHealthcareServiceSocialEquipmentProfile.fsh
+++ b/input/fsh/profiles/AsHealthcareServiceSocialEquipmentProfile.fsh
@@ -56,23 +56,23 @@ Target: "https://mos.esante.gouv.fr"
Id: as-healthcare-social-equipment-to-mos-activite-sociale
Title: "AsHealthcareServiceSocialEquipmentProfile to MOS - ActiviteSociale"
* -> "ActiviteSociale"
-* extension[as-ext-authorization].extension[dateAuthorization] -> "dateAutorisation"
-* extension[as-ext-authorization].extension[periodAuthorization].valuePeriod.start -> "datePremiereInstallation"
-* extension[as-ext-authorization].extension[deleteAuthorization] -> "suppressionAutorisation"
-* extension[as-ext-authorization].extension[deleteInstallation] -> "suppressionInstallation"
+* extension[as-ext-authorization].extension[dateAuthorization] -> "ActiviteSociale.dateAutorisation"
+* extension[as-ext-authorization].extension[periodAuthorization].valuePeriod.start -> "ActiviteSociale.datePremiereInstallation"
+* extension[as-ext-authorization].extension[deleteAuthorization] -> "ActiviteSociale.suppressionAutorisation"
+* extension[as-ext-authorization].extension[deleteInstallation] -> "ActiviteSociale.suppressionInstallation"
-* extension[as-ext-supported-capacity].extension[capacityAvailable] -> "capaciteAutorisee"
-* extension[as-ext-supported-capacity].extension[femaleCapacityAvailable] -> "capaciteAutoriseeFemme"
-* extension[as-ext-supported-capacity].extension[maleCapacityAvailable] -> "capaciteAutoriseeHomme"
-* extension[as-ext-supported-capacity].extension[socialAssistanceCapacityAvailable] -> "capaciteAutoriseeHabiliteAideSociale"
-* extension[as-ext-supported-capacity].extension[installedCapacity] -> "capaciteInstallee"
-* extension[as-ext-supported-capacity].extension[femaleInstalledCapacity] -> "capaciteInstalleeFemme"
-* extension[as-ext-supported-capacity].extension[maleInstalledCapacity] -> "capaciteInstalleeHomme"
-* extension[as-ext-supported-capacity].extension[socialAssistanceInstalledCapacity] -> "capaciteInstalleeHabiliteAideSociale"
+* extension[as-ext-supported-capacity].extension[capacityAvailable] -> "ActiviteSociale.capaciteAutorisee"
+* extension[as-ext-supported-capacity].extension[femaleCapacityAvailable] -> "ActiviteSociale.capaciteAutoriseeFemme"
+* extension[as-ext-supported-capacity].extension[maleCapacityAvailable] -> "ActiviteSociale.capaciteAutoriseeHomme"
+* extension[as-ext-supported-capacity].extension[socialAssistanceCapacityAvailable] -> "ActiviteSociale.capaciteAutoriseeHabiliteAideSociale"
+* extension[as-ext-supported-capacity].extension[installedCapacity] -> "ActiviteSociale.capaciteInstallee"
+* extension[as-ext-supported-capacity].extension[femaleInstalledCapacity] -> "ActiviteSociale.capaciteInstalleeFemme"
+* extension[as-ext-supported-capacity].extension[maleInstalledCapacity] -> "ActiviteSociale.capaciteInstalleeHomme"
+* extension[as-ext-supported-capacity].extension[socialAssistanceInstalledCapacity] -> "ActiviteSociale.capaciteInstalleeHabiliteAideSociale"
-* extension[as-ext-patient-type].extension[authorizedAgeRange].valueRange.low -> "ageMinAutorisee"
-* extension[as-ext-patient-type].extension[authorizedAgeRange].valueRange.high -> "ageMaxAutorisee"
-* extension[as-ext-patient-type].extension[installedAgeRange].valueRange.low -> "ageMaxInstallee"
-* extension[as-ext-patient-type].extension[installedAgeRange].valueRange.high -> "ageMaxInstallee"
-* type -> "discipineEquipementSociale"
-* eligibility.code -> "clientele"
\ No newline at end of file
+* extension[as-ext-patient-type].extension[authorizedAgeRange].valueRange.low -> "ActiviteSociale.ageMinAutorisee"
+* extension[as-ext-patient-type].extension[authorizedAgeRange].valueRange.high -> "ActiviteSociale.ageMaxAutorisee"
+* extension[as-ext-patient-type].extension[installedAgeRange].valueRange.low -> "ActiviteSociale.ageMaxInstallee"
+* extension[as-ext-patient-type].extension[installedAgeRange].valueRange.high -> "ActiviteSociale.ageMaxInstallee"
+* type -> "ActiviteSociale.discipineEquipementSociale"
+* eligibility.code -> "ActiviteSociale.clientele"
\ No newline at end of file
diff --git a/input/fsh/profiles/AsOrganizationProfile.fsh b/input/fsh/profiles/AsOrganizationProfile.fsh
index 3d1f76e919..f4cff60603 100644
--- a/input/fsh/profiles/AsOrganizationProfile.fsh
+++ b/input/fsh/profiles/AsOrganizationProfile.fsh
@@ -121,20 +121,20 @@ Target: "https://mos.esante.gouv.fr"
Id: as-organization-to-mos-ej
Title: "AsOrganization to MOS - EJ"
* -> "EntiteJuridique"
-* identifier[finess] -> "numFiness"
-* identifier[sirene] -> "numSiren"
-* identifier[idNatSt] -> "idNat_struct"
-* extension[as-ext-organization-pharmacy-licence] -> "numeroLicenceOfficine"
-* name -> "raisonSociale"
-* alias -> "raisonSocialeLongue"
-* type[statutJuridiqueINSEE] -> "statutJuridique"
-* type[activiteINSEE] -> "codeAPEN"
-* extension[usePeriod].valuePeriod.start -> "dateCreation"
-* extension[usePeriod].valuePeriod.end -> "dateFermeture"
-* extension[as-ext-organization-closing-type] -> "typeFermeture"
-* address -> "adresseEJ"
-* telecom -> "telecommunication"
-* telecom[mailbox-mss] -> "boiteLettreMSS"
+* identifier[finess] -> "EntiteJuridique.numFiness"
+* identifier[sirene] -> "EntiteJuridique.numSiren"
+* identifier[idNatSt] -> "EntiteJuridique.idNat_struct"
+* extension[as-ext-organization-pharmacy-licence] -> "EntiteJuridique.numeroLicenceOfficine"
+* name -> "EntiteJuridique.raisonSociale"
+* alias -> "EntiteJuridique.raisonSocialeLongue"
+* type[statutJuridiqueINSEE] -> "EntiteJuridique.statutJuridique"
+* type[activiteINSEE] -> "EntiteJuridique.codeAPEN"
+* extension[usePeriod].valuePeriod.start -> "EntiteJuridique.dateCreation"
+* extension[usePeriod].valuePeriod.end -> "EntiteJuridique.dateFermeture"
+* extension[as-ext-organization-closing-type] -> "EntiteJuridique.typeFermeture"
+* address -> "EntiteJuridique.adresseEJ"
+* telecom -> "EntiteJuridique.telecommunication"
+* telecom[mailbox-mss] -> "EntiteJuridique.boiteLettreMSS"
Mapping: AsOrganizationToMOSEG
Source: AsOrganizationProfile
@@ -142,19 +142,19 @@ Target: "https://mos.esante.gouv.fr"
Id: as-organization-to-mos-eg
Title: "AsOrganization to MOS - EG"
* -> "EntiteGeographique"
-* identifier[finess] -> "numFiness"
-* identifier[sirene] -> "numSiren"
-* identifier[idNatSt] -> "idNat_struct"
-* name -> "denominationEG"
-* alias -> "denominationEGLongue"
-* type[activiteINSEE] -> "codeAPET"
-* extension[as-ext-organization-pricing-model] -> "modeFixationTarifaire"
-* extension[as-ext-organization-budget-type] -> "natureEtablissement"
-* extension[as-ext-organization-closing-type] -> "typeFermeture"
-* extension[usePeriod].valuePeriod.start -> "dateOuverture"
-* extension[usePeriod].valuePeriod.end -> "dateFermeture"
-* type[sphParticipation] -> "codeAPET"
-* active -> "actif"
-* address -> "adresseEG"
-* telecom -> "telecommunication"
-* telecom[mailbox-mss] -> "boiteLettreMSS"
\ No newline at end of file
+* identifier[finess] -> "EntiteGeographique.numFiness"
+* identifier[sirene] -> "EntiteGeographique.numSiren"
+* identifier[idNatSt] -> "EntiteGeographique.idNat_struct"
+* name -> "EntiteGeographique.denominationEG"
+* alias -> "EntiteGeographique.denominationEGLongue"
+* type[activiteINSEE] -> "EntiteGeographique.codeAPET"
+* extension[as-ext-organization-pricing-model] -> "EntiteGeographique.modeFixationTarifaire"
+* extension[as-ext-organization-budget-type] -> "EntiteGeographique.natureEtablissement"
+* extension[as-ext-organization-closing-type] -> "EntiteGeographique.typeFermeture"
+* extension[usePeriod].valuePeriod.start -> "EntiteGeographique.dateOuverture"
+* extension[usePeriod].valuePeriod.end -> "EntiteGeographique.dateFermeture"
+* type[sphParticipation] -> "EntiteGeographique.codeAPET"
+* active -> "EntiteGeographique.actif"
+* address -> "EntiteGeographique.adresseEG"
+* telecom -> "EntiteGeographique.telecommunication"
+* telecom[mailbox-mss] -> "EntiteGeographique.boiteLettreMSS"
\ No newline at end of file
diff --git a/input/fsh/profiles/AsPersonProfile.fsh b/input/fsh/profiles/AsPersonProfile.fsh
index 5929c3c246..18c42e6ad4 100644
--- a/input/fsh/profiles/AsPersonProfile.fsh
+++ b/input/fsh/profiles/AsPersonProfile.fsh
@@ -68,14 +68,14 @@ Target: "https://mos.esante.gouv.fr"
Id: as-person-to-mos-personne-physique
Title: "AsPersonProfile to MOS - PersonnePhysique"
* -> "PersonnePhysique"
-* extension[as-ext-person-deceased-date-time] -> "dateDeces"
-* extension[as-ext-person-birth-place] -> "lieuNaissance"
-* extension[as-ext-person-nationality] -> "paysNationalite"
-* name.prefix -> "civilite"
-* name.family -> "nomFamille"
-* name.family -> "nomUsage"
-* name.given -> "prenom"
-* name.given -> "prenomUsuel"
-* gender -> "sexeAdministratif"
-* language -> "langueParlee"
-* birthDate -> "dateNaissance"
+* extension[as-ext-person-deceased-date-time] -> "PersonnePhysique.dateDeces"
+* extension[as-ext-person-birth-place] -> "PersonnePhysique.lieuNaissance"
+* extension[as-ext-person-nationality] -> "PersonnePhysique.paysNationalite"
+* name.prefix -> "PersonnePhysique.civilite"
+* name.family -> "PersonnePhysique.nomFamille"
+* name.family -> "PersonnePhysique.nomUsage"
+* name.given -> "PersonnePhysique.prenom"
+* name.given -> "PersonnePhysique.prenomUsuel"
+* gender -> "PersonnePhysique.sexeAdministratif"
+* language -> "PersonnePhysique.langueParlee"
+* birthDate -> "PersonnePhysique.dateNaissance"
diff --git a/input/fsh/profiles/AsPractitionerProfile.fsh b/input/fsh/profiles/AsPractitionerProfile.fsh
index 7ff0c73338..71b4b5e4e7 100644
--- a/input/fsh/profiles/AsPractitionerProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerProfile.fsh
@@ -198,9 +198,9 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-savoir-faire
Title: "AsPractitionerProfile to MOS - SavoirFaire"
* -> "SavoirFaire"
-* qualification[savoirFaire].code -> "typeSavoirFaire"
-* qualification[savoirFaire].period.start -> "dateReconnaissance"
-* qualification[savoirFaire].period.end -> "dateAbandon"
+* qualification[savoirFaire].code -> "SavoirFaire.typeSavoirFaire"
+* qualification[savoirFaire].period.start -> "SavoirFaire.dateReconnaissance"
+* qualification[savoirFaire].period.end -> "SavoirFaire.dateAbandon"
Mapping: AsPractitionerProfileToMOSExerciceProfessionnel
Source: AsPractitionerProfile
@@ -208,16 +208,16 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-exercice-professionnel
Title: "AsPractitionerProfile to MOS - ExerciceProfessionnel"
* -> "ExerciceProfessionnel"
-* name.suffix -> "civiliteExercice"
-* name.family -> "nomExercice"
-* name.given -> "prenomExercice"
+* name.suffix -> "ExerciceProfessionnel.civiliteExercice"
+* name.family -> "ExerciceProfessionnel.nomExercice"
+* name.given -> "ExerciceProfessionnel.prenomExercice"
-* qualification[exercicePro].code.coding[profession] -> "profession"
-* qualification[exercicePro].code.coding[categorieProfession] -> "categorieProfession"
-* qualification[exercicePro].period.start -> "dateEffetExercice"
-* qualification[exercicePro].period.end -> "dateFinEffetExercice"
+* qualification[exercicePro].code.coding[profession] -> "ExerciceProfessionnel.profession"
+* qualification[exercicePro].code.coding[categorieProfession] -> "ExerciceProfessionnel.categorieProfession"
+* qualification[exercicePro].period.start -> "ExerciceProfessionnel.dateEffetExercice"
+* qualification[exercicePro].period.end -> "ExerciceProfessionnel.dateFinEffetExercice"
-* telecom[mailbox-mss] -> "boiteLettresMSS"
+* telecom[mailbox-mss] -> "ExerciceProfessionnel.boiteLettresMSS"
Mapping: AsPractitionerProfileToMOSInscriptionOrdre
@@ -226,11 +226,11 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-inscription-ordre
Title: "AsPractitionerProfile to MOS - InscriptionOrdre"
* -> "InscriptionOrdre"
-* extension[as-ext-registration].extension[registeringOrganization] -> "ordre"
-* extension[as-ext-registration].extension[period].valuePeriod.start -> "dateDebutInscription"
-* extension[as-ext-registration].extension[period].valuePeriod.end -> "dateRadiation"
-* extension[as-ext-registration].extension[status] -> "statutInscription"
-* extension[as-ext-registration].extension[hostingDepartment] -> "conseilDepartemental"
+* extension[as-ext-registration].extension[registeringOrganization] -> "InscriptionOrdre.ordre"
+* extension[as-ext-registration].extension[period].valuePeriod.start -> "InscriptionOrdre.dateDebutInscription"
+* extension[as-ext-registration].extension[period].valuePeriod.end -> "InscriptionOrdre.dateRadiation"
+* extension[as-ext-registration].extension[status] -> "InscriptionOrdre.statutInscription"
+* extension[as-ext-registration].extension[hostingDepartment] -> "InscriptionOrdre.conseilDepartemental"
Mapping: AsPractitionerProfileToMOSDiplome
Source: AsPractitionerProfile
@@ -238,15 +238,15 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-diplome
Title: "AsPractitionerProfile to MOS - Diplome"
* -> "Diplome"
-* qualification.identifier -> "numeroDiplome"
-* qualification.code -> "codeDiplome"
-* qualification[degree] -> "typeDiplome"
-* qualification[degree].issuer -> "lieuFormation"
-* qualification[degree].period.start -> "dateDebut"
-* qualification[degree].period.end -> "dateFin"
-* qualification[degree].extension[as-ext-education-level].extension[academicDegree] -> "natureCycleFormation"
-* qualification[degree].extension[as-ext-education-level].extension[achievedLevel] -> "anneeUniversitaire"
-* qualification[degree].extension[as-ext-education-level].extension[academicYear] -> "niveauFormationAcquis"
+* qualification.identifier -> "Diplome.numeroDiplome"
+* qualification.code -> "Diplome.codeDiplome"
+* qualification[degree] -> "Diplome.typeDiplome"
+* qualification[degree].issuer -> "Diplome.lieuFormation"
+* qualification[degree].period.start -> "Diplome.dateDebut"
+* qualification[degree].period.end -> "Diplome.dateFin"
+* qualification[degree].extension[as-ext-education-level].extension[academicDegree] -> "Diplome.natureCycleFormation"
+* qualification[degree].extension[as-ext-education-level].extension[achievedLevel] -> "Diplome.anneeUniversitaire"
+* qualification[degree].extension[as-ext-education-level].extension[academicYear] -> "Diplome.niveauFormationAcquis"
Mapping: AsPractitionerProfileToMOSProfessionnel
Source: AsPractitionerProfile
@@ -264,8 +264,8 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-autorisation-exercice
Title: "AsPractitionerProfile to MOS - AutorisationExercice"
* -> "AutorisationExercice"
-* extension[as-ext-frpractitioner-authorization].extension[type] -> "typeAutorisation"
-* extension[as-ext-frpractitioner-authorization].extension[field] -> "disciplineAutorisee"
-* extension[as-ext-frpractitioner-authorization].extension[period].valuePeriod.start -> "dateDebutAutorisation"
-* extension[as-ext-frpractitioner-authorization].extension[period].valuePeriod.end -> "dateFinAutorisation"
-* extension[as-ext-frpractitioner-authorization].extension[profession] -> "profession"
\ No newline at end of file
+* extension[as-ext-frpractitioner-authorization].extension[type] -> "AutorisationExercice.typeAutorisation"
+* extension[as-ext-frpractitioner-authorization].extension[field] -> "AutorisationExercice.disciplineAutorisee"
+* extension[as-ext-frpractitioner-authorization].extension[period].valuePeriod.start -> "AutorisationExercice.dateDebutAutorisation"
+* extension[as-ext-frpractitioner-authorization].extension[period].valuePeriod.end -> "AutorisationExercice.dateFinAutorisation"
+* extension[as-ext-frpractitioner-authorization].extension[profession] -> "AutorisationExercice.profession"
\ No newline at end of file
diff --git a/input/fsh/profiles/AsPractitionerRoleProfile.fsh b/input/fsh/profiles/AsPractitionerRoleProfile.fsh
index 8fba201907..983deafcf3 100644
--- a/input/fsh/profiles/AsPractitionerRoleProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerRoleProfile.fsh
@@ -144,16 +144,16 @@ Target: "https://mos.esante.gouv.fr"
Id: as-practitioner-role-to-mos-situation-exercice
Title: "AsPractitionerRoleProfile to MOS - SituationExercice"
* -> "SituationExercice"
-* identifier[numeroAm] -> "numeroAM"
-* code[fonction] -> "role"
-* code[modeExercice] -> "modeExercice"
-* code[genreActivite] -> "genreActivite"
-* code[statutHospitalier] -> "statutHospitalier"
-* code[metierPharmacien] -> "metierPharmacien"
-* code[metierPharmacien] -> "metierPharmacien"
-* code[typeActiviteLiberale] -> "typeActiviteLiberale"
-* code[statutProfessionnelSSA] -> "statutPS_SSA"
-* period.start -> "dateDebutActivite"
-* period.end -> "dateFinActivite"
-* telecom -> "telecommunication"
-* telecom[mailbox-mss] -> "boiteLettresMSS"
+* identifier[numeroAm] -> "SituationExercice.numeroAM"
+* code[fonction] -> "SituationExercice.role"
+* code[modeExercice] -> "SituationExercice.modeExercice"
+* code[genreActivite] -> "SituationExercice.genreActivite"
+* code[statutHospitalier] -> "SituationExercice.statutHospitalier"
+* code[metierPharmacien] -> "SituationExercice.metierPharmacien"
+* code[metierPharmacien] -> "SituationExercice.metierPharmacien"
+* code[typeActiviteLiberale] -> "SituationExercice.typeActiviteLiberale"
+* code[statutProfessionnelSSA] -> "SituationExercice.statutPS_SSA"
+* period.start -> "SituationExercice.dateDebutActivite"
+* period.end -> "SituationExercice.dateFinActivite"
+* telecom -> "SituationExercice.telecommunication"
+* telecom[mailbox-mss] -> "SituationExercice.boiteLettresMSS"
From 4b5a2255f8b854f78a09f04888fd1486cf5b1f3c Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:41:41 +0200
Subject: [PATCH 18/27] fix examples
---
input/fsh/examples/DP/PP16DP-Organization.fsh | 2 ++
input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh | 3 +++
input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh | 2 ++
input/fsh/examples/DR/PP16DR-Organization.fsh | 2 ++
input/fsh/examples/DR/PP16DR-Person.fsh | 3 +--
input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh | 3 +++
input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh | 2 ++
input/fsh/extensions/AsOrganizationTypes.fsh | 3 ++-
input/fsh/profiles/AsOrganizationProfile.fsh | 3 +++
9 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
index 62791acfb9..7d025cf094 100644
--- a/input/fsh/examples/DP/PP16DP-Organization.fsh
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -50,10 +50,12 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA33
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
index 89c076c26f..47544e5d08 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -50,14 +50,17 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA01
* type[activiteINSEE][+]
+ * extension[as-ext-organization-types] = #activiteINSEE
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
* code = #86.10Z
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
index 56562bb42e..d7afc23427 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
@@ -45,10 +45,12 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA08
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 25babf7b8b..4ea01db5bb 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -50,10 +50,12 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA33
diff --git a/input/fsh/examples/DR/PP16DR-Person.fsh b/input/fsh/examples/DR/PP16DR-Person.fsh
index bff4ea11e1..295d76017e 100644
--- a/input/fsh/examples/DR/PP16DR-Person.fsh
+++ b/input/fsh/examples/DR/PP16DR-Person.fsh
@@ -8,8 +8,7 @@ Usage: #example
* given[+] = "David"
// Nationalité
-* extension[+]
- * url = "https://interop.esante.gouv.fr/ig/fhir/annuaire/StructureDefinition/as-ext-person-nationality"
+* extension[as-ext-person-nationality]
* extension[+]
* url = "code"
* valueCodeableConcept
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index f0cdbc445d..47523ddce5 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -50,14 +50,17 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA01
* type[activiteINSEE][+]
+ * extension[as-ext-organization-types] = #activiteINSEE
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
* code = #86.10Z
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
index 21d47bdee4..c540178ce1 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -45,10 +45,12 @@ Usage: #example
// Type
* type[organizationType][+]
+ * extension[as-ext-organization-types] = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
+ * extension[as-ext-organization-types] = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA08
diff --git a/input/fsh/extensions/AsOrganizationTypes.fsh b/input/fsh/extensions/AsOrganizationTypes.fsh
index e2c6a12c17..9d32248091 100644
--- a/input/fsh/extensions/AsOrganizationTypes.fsh
+++ b/input/fsh/extensions/AsOrganizationTypes.fsh
@@ -23,4 +23,5 @@ Description: "CodeSystem définissant les types d'organisation"
* #activiteINSEE "Activité INSEE" "Activité INSEE"
* #statutJuridiqueINSEE "Statut Juridique INSEE" "Statut Juridique INSEE"
* #sphParticipation "sph Participation" "Participation au service public hospitalier"
-* #typeEtablissement "Type d'établissement" "Type d'établissement"
\ No newline at end of file
+* #typeEtablissement "Type d'établissement" "Type d'établissement"
+* #secteurActiviteRASS "Secteur d'activité RASS" "Secteur d'activité RASS"
\ No newline at end of file
diff --git a/input/fsh/profiles/AsOrganizationProfile.fsh b/input/fsh/profiles/AsOrganizationProfile.fsh
index f4cff60603..9cff3b0a40 100644
--- a/input/fsh/profiles/AsOrganizationProfile.fsh
+++ b/input/fsh/profiles/AsOrganizationProfile.fsh
@@ -66,6 +66,9 @@ Description: "Profil générique créé à partir de FrOrganization dans le cont
* type[typeEtablissement].extension[as-ext-organization-types].valueCode = #typeEtablissement
* type[typeEtablissement].text MS // TypeEtablissement est de type string dans le MOS, il faut donc mettre dans le champs text. Pourquoi est-ce que le type d'établissement est un text et non un code dans le MOS ?
+* type[secteurActiviteRASS].extension contains as-ext-organization-types named as-ext-organization-types 1..1
+* type[secteurActiviteRASS].extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
+
// adresse
* address MS
* address ^short = "adresseEJ : Adresse géopostale de l'entité juridique ou adresseEG : Adresse(s) géopostale(s) de l'entité géographique."
From 39e50e3bb68de0ae68b98c2e9da4fb68f2908bb0 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:44:16 +0200
Subject: [PATCH 19/27] update discriminator
---
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 2 +-
input/fsh/profiles/AsPractitionerProfile.fsh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index b61ecf00bc..3ceda6e821 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -31,7 +31,7 @@ Usage: #example
* extension[status]
* valueCodeableConcept
* coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription"
* code = #D
* extension[period]
* valuePeriod
diff --git a/input/fsh/profiles/AsPractitionerProfile.fsh b/input/fsh/profiles/AsPractitionerProfile.fsh
index 71b4b5e4e7..848b0376e6 100644
--- a/input/fsh/profiles/AsPractitionerProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerProfile.fsh
@@ -98,8 +98,8 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
* qualification[degree] MS
* qualification[degree] ^short = "Diplôme et type de diplôme, par exemple : DE, DES, CES, etc. (typeDiplome)"
-* qualification[degree].code.coding ^slicing.discriminator.type = #value
-* qualification[degree].code.coding ^slicing.discriminator.path = "system"
+* qualification[degree].code.coding ^slicing.discriminator.type = #pattern
+* qualification[degree].code.coding ^slicing.discriminator.path = "$this"
* qualification[degree].code.coding ^slicing.rules = #closed
* qualification[degree].code.coding contains degreeType 0..1 and degree 0..1
From 315dcdc28ff769018cd11c4fae08c9db2e5a770d Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:45:29 +0200
Subject: [PATCH 20/27] update discr
---
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 2 +-
input/fsh/profiles/AsPractitionerRoleProfile.fsh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index f9cf40e112..ffe29ebaff 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -120,7 +120,7 @@ Usage: #example
* extension[status]
* valueCodeableConcept
* coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription/"
+ * system = "https://mos.esante.gouv.fr/NOS/TRE_R33-StatutInscription/FHIR/TRE-R33-StatutInscription"
* code = #D
* extension[period]
* valuePeriod
diff --git a/input/fsh/profiles/AsPractitionerRoleProfile.fsh b/input/fsh/profiles/AsPractitionerRoleProfile.fsh
index 983deafcf3..bbd3ddf0d5 100644
--- a/input/fsh/profiles/AsPractitionerRoleProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerRoleProfile.fsh
@@ -70,8 +70,8 @@ Description: "Profil générique créé à partir de FrPractitionerRoleExercice
// Slicing au niveau de PractitionerRole.code
-* code ^slicing.discriminator.type = #value
-* code ^slicing.discriminator.path = "coding.system"
+* code ^slicing.discriminator.type = #pattern
+* code ^slicing.discriminator.path = "$this"
* code ^slicing.rules = #open
* code contains
genreActivite 0..1 MS and
From c2bd93e0db1dbf90ecbff11007f66044c4d773b2 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:48:11 +0200
Subject: [PATCH 21/27] resolve errors
---
input/fsh/examples/DP/PP16DP-Organization.fsh | 4 ++--
input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh | 6 +++---
input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh | 4 ++--
input/fsh/examples/DR/PP16DR-Organization.fsh | 4 ++--
input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh | 6 +++---
input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Organization.fsh b/input/fsh/examples/DP/PP16DP-Organization.fsh
index 7d025cf094..e8c9669e17 100644
--- a/input/fsh/examples/DP/PP16DP-Organization.fsh
+++ b/input/fsh/examples/DP/PP16DP-Organization.fsh
@@ -50,12 +50,12 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA33
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
index 47544e5d08..31c1354381 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EG-CH.fsh
@@ -50,17 +50,17 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA01
* type[activiteINSEE][+]
- * extension[as-ext-organization-types] = #activiteINSEE
+ * extension[as-ext-organization-types].valueCode = #activiteINSEE
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
* code = #86.10Z
diff --git a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
index d7afc23427..ec7c4feb22 100644
--- a/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DP/PP19DP-Organization-EJ-Cab.fsh
@@ -45,12 +45,12 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA08
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 4ea01db5bb..264d82b7d6 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -50,12 +50,12 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA33
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
index 47523ddce5..3a16e5e2a4 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EG-CH.fsh
@@ -50,17 +50,17 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #GEOGRAPHICAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA01
* type[activiteINSEE][+]
- * extension[as-ext-organization-types] = #activiteINSEE
+ * extension[as-ext-organization-types].valueCode = #activiteINSEE
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R75-InseeNAFrev2Niveau5/FHIR/TRE-R75-InseeNAFrev2Niveau5/"
* code = #86.10Z
diff --git a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
index c540178ce1..918a794621 100644
--- a/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
+++ b/input/fsh/examples/DR/PP19DR-Organization-EJ-Cab.fsh
@@ -45,12 +45,12 @@ Usage: #example
// Type
* type[organizationType][+]
- * extension[as-ext-organization-types] = #organizationType
+ * extension[as-ext-organization-types].valueCode = #organizationType
* coding
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-3307"
* code = #LEGAL-ENTITY
* type[secteurActiviteRASS][+]
- * extension[as-ext-organization-types] = #secteurActiviteRASS
+ * extension[as-ext-organization-types].valueCode = #secteurActiviteRASS
* coding
* system = "https://mos.esante.gouv.fr/NOS/TRE_R02-SecteurActivite/FHIR/TRE-R02-SecteurActivite"
* code = #SA08
From 8a9055fc2f60a0bfbc405fd74112ec06a99d64b2 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:58:07 +0200
Subject: [PATCH 22/27] modify discriminator Practitioner.qualification
---
input/fsh/profiles/AsPractitionerProfile.fsh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/input/fsh/profiles/AsPractitionerProfile.fsh b/input/fsh/profiles/AsPractitionerProfile.fsh
index 848b0376e6..5acc6d044d 100644
--- a/input/fsh/profiles/AsPractitionerProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerProfile.fsh
@@ -89,8 +89,8 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
* qualification MS
-* qualification ^slicing.discriminator.type = #value
-* qualification ^slicing.discriminator.path = "code"
+* qualification ^slicing.discriminator.type = #pattern
+* qualification ^slicing.discriminator.path = "$this"
* qualification ^slicing.rules = #open
* qualification contains degree 0..*
From fdfbfa0ce7a61b7d86ec3d17e6a55459500a605d Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:17:47 +0200
Subject: [PATCH 23/27] modify qualif place
---
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 4 ++++
input/fsh/examples/DP/PP16DP-PractitionerRole.fsh | 6 ------
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 7 ++++++-
.../fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh | 6 ------
.../fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh | 6 ------
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 7 +++++++
input/fsh/examples/DR/PP16DR-PractitionerRole.fsh | 6 ------
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 8 ++++++--
.../fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh | 12 +++---------
.../fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh | 12 +++---------
10 files changed, 29 insertions(+), 45 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index 0b50b43c44..eb2c0f414c 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -67,3 +67,7 @@ Usage: #example
* coding[+][degreeType]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
* code = #DE
+
+* qualification[exercicePro]
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
index 4996171a89..b778b4292b 100644
--- a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
+++ b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
@@ -31,12 +31,6 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #21
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index 4175b277de..216790d929 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -61,4 +61,9 @@ Usage: #example
* code = #DE05
* coding[degreeType]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
- * code = #DE
\ No newline at end of file
+ * code = #DE
+
+
+* qualification[exercicePro]
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
index 94acacbf32..1910637d6e 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
@@ -31,12 +31,6 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #10
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
index e9f85fc037..bc083efee1 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
@@ -31,12 +31,6 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #10
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index 3ceda6e821..0d9d8e29c5 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -126,3 +126,10 @@ Usage: #example
+* qualification[exercicePro]
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
+
+
+
+
diff --git a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
index e18570e273..ee3df13bc1 100644
--- a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
+++ b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
@@ -35,12 +35,6 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #21
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
* coding[+]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index ffe29ebaff..9576c54a26 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -98,7 +98,9 @@ Usage: #example
* issuer = Reference(Organization/u33)
-
+* qualification[exercicePro]
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
// Enregistrement
* extension[as-ext-registration][+]
@@ -124,4 +126,6 @@ Usage: #example
* code = #D
* extension[period]
* valuePeriod
- * start = "2019-03-30"
\ No newline at end of file
+ * start = "2019-03-30"
+
+
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
index b7aa74ead6..9496200865 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
@@ -35,19 +35,13 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #10
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
- * coding[+]
+ * coding[genreActivite]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
- * coding[+]
+ * coding[modeExercice]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
* code = #L
- * coding[+]
+ * coding[fonction]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
* code = #FON-AU
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
index 8ddf517dc0..28293529cb 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
@@ -35,19 +35,13 @@ Usage: #example
// Code
* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante"
- * code = #10
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle"
- * code = #C
- * coding[+]
+ * coding[genreActivite]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
* code = #GENR01
- * coding[+]
+ * coding[modeExercice]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
* code = #S
- * coding[+]
+ * coding[fonction]
* system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
* code = #FON-AU
From c7701a0f236305dcbc9872a62fa03a0cac8d034d Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:24:37 +0200
Subject: [PATCH 24/27] resolve errors
---
input/fsh/examples/DP/PP16DP-Practitioner.fsh | 5 +++--
input/fsh/examples/DP/PP16DP-PractitionerRole.fsh | 13 +++----------
input/fsh/examples/DP/PP19DP-Practitioner.fsh | 5 +++--
.../examples/DP/PP19DP-PractitionerRole-Lib.fsh | 14 ++++----------
.../examples/DP/PP19DP-PractitionerRole-Sal.fsh | 13 +++----------
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 5 +++--
input/fsh/examples/DR/PP16DR-PractitionerRole.fsh | 13 +++----------
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 5 +++--
.../examples/DR/PP19DR-PractitionerRole-Lib.fsh | 13 +++----------
.../examples/DR/PP19DR-PractitionerRole-Sal.fsh | 13 +++----------
10 files changed, 31 insertions(+), 68 deletions(-)
diff --git a/input/fsh/examples/DP/PP16DP-Practitioner.fsh b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
index eb2c0f414c..b9b73ea5e2 100644
--- a/input/fsh/examples/DP/PP16DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP16DP-Practitioner.fsh
@@ -69,5 +69,6 @@ Usage: #example
* code = #DE
* qualification[exercicePro]
- * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
- * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
+ * code
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
index b778b4292b..4189a082ce 100644
--- a/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
+++ b/input/fsh/examples/DP/PP16DP-PractitionerRole.fsh
@@ -30,16 +30,9 @@ Usage: #example
* organization = Reference(Organization/481677)
// Code
-* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #L
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#L
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
// Langage
* language = #fr
diff --git a/input/fsh/examples/DP/PP19DP-Practitioner.fsh b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
index 216790d929..729403cf20 100644
--- a/input/fsh/examples/DP/PP19DP-Practitioner.fsh
+++ b/input/fsh/examples/DP/PP19DP-Practitioner.fsh
@@ -65,5 +65,6 @@ Usage: #example
* qualification[exercicePro]
- * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
- * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
+ * code
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
index 1910637d6e..cf9c9b71a5 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Lib.fsh
@@ -30,16 +30,10 @@ Usage: #example
* organization = Reference(Organization/548812)
// Code
-* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #L
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#L
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
+
// Langage
* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
index bc083efee1..f957b489e8 100644
--- a/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DP/PP19DP-PractitionerRole-Sal.fsh
@@ -30,16 +30,9 @@ Usage: #example
* organization = Reference(Organization/158480)
// Code
-* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #S
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#S
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
// Langage
* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index 0d9d8e29c5..d1d14e0e6b 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -127,8 +127,9 @@ Usage: #example
* qualification[exercicePro]
- * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
- * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
+ * code
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#21
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
diff --git a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
index ee3df13bc1..c45af3e18c 100644
--- a/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
+++ b/input/fsh/examples/DR/PP16DR-PractitionerRole.fsh
@@ -34,16 +34,9 @@ Usage: #example
* start = "2019-01-31"
// Code
-* code[+]
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #L
- * coding[+]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#L
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
// Langage
* language = #fr
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index 9576c54a26..c341c362b7 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -99,8 +99,9 @@ Usage: #example
* qualification[exercicePro]
- * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
- * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
+ * code
+ * coding[profession] = https://mos.esante.gouv.fr/NOS/TRE_G15-ProfessionSante/FHIR/TRE-G15-ProfessionSante#10
+ * coding[categorieProfession] = https://mos.esante.gouv.fr/NOS/TRE_R09-CategorieProfessionnelle/FHIR/TRE-R09-CategorieProfessionnelle#C
// Enregistrement
* extension[as-ext-registration][+]
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
index 9496200865..a29a8ac116 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Lib.fsh
@@ -34,16 +34,9 @@ Usage: #example
* start = "2019-09-03"
// Code
-* code[+]
- * coding[genreActivite]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[modeExercice]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #L
- * coding[fonction]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#L
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
// Langage
* language = #fr
\ No newline at end of file
diff --git a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
index 28293529cb..757110dbd4 100644
--- a/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
+++ b/input/fsh/examples/DR/PP19DR-PractitionerRole-Sal.fsh
@@ -34,16 +34,9 @@ Usage: #example
* start = "2019-06-30"
// Code
-* code[+]
- * coding[genreActivite]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite"
- * code = #GENR01
- * coding[modeExercice]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice"
- * code = #S
- * coding[fonction]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction"
- * code = #FON-AU
+* code[genreActivite] = https://mos.esante.gouv.fr/NOS/TRE_R22-GenreActivite/FHIR/TRE-R22-GenreActivite#GENR01
+* code[modeExercice] = https://mos.esante.gouv.fr/NOS/TRE_R23-ModeExercice/FHIR/TRE-R23-ModeExercice#S
+* code[fonction] = https://mos.esante.gouv.fr/NOS/TRE_R21-Fonction/FHIR/TRE-R21-Fonction#FON-AU
// Langage
* language = #fr
\ No newline at end of file
From a57754d93e65dfae11462af4728258ac348fcfc9 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 16:01:58 +0200
Subject: [PATCH 25/27] add mailbox mss
---
input/fsh/examples/DR/PP16DR-Organization.fsh | 8 +++++++
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 6 +++++-
input/fsh/examples/DR/PP19DR-Practitioner.fsh | 8 ++-----
input/fsh/profiles/AsPractitionerProfile.fsh | 21 ++++++++-----------
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 264d82b7d6..51bafb4294 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -42,6 +42,14 @@ Usage: #example
* system = "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-cs-v2-0203"
* code = #INTRN
+
+* telecom[mailbox-mss]
+ * system = #email
+ * value = "xxxx@xxxxx.mssante.fr"
+ * extension[emailType].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R256-TypeMessagerie/FHIR/TRE-R256-TypeMessagerie#MSSANTE
+ * extension[as-mailbox-mss-metadata].extension[type] = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#ORG
+
+
// Nom
* name = "PHARMACIE NOLOT"
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index d1d14e0e6b..0d05fc1cf3 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -109,7 +109,11 @@ Usage: #example
* telecom[+]
* system = #email
* value = "davidchatelier@orange.fr"
- // TODO : Ajouter telecom[maiboxmss]
+* telecom[mailbox-mss]
+ * system = #email
+ * value = "davidchatelier@pro.mssante.fr"
+ * extension[emailType].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R256-TypeMessagerie/FHIR/TRE-R256-TypeMessagerie#MSSANTE
+ * extension[as-mailbox-mss-metadata].extension[type] = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#PER
// Qualification
* qualification[degree][0]
diff --git a/input/fsh/examples/DR/PP19DR-Practitioner.fsh b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
index c341c362b7..c143739689 100644
--- a/input/fsh/examples/DR/PP19DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP19DR-Practitioner.fsh
@@ -88,12 +88,8 @@ Usage: #example
// Qualification
* qualification[degree][+]
* code
- * coding[degree]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais"
- * code = #DE05
- * coding[degreeType]
- * system = "https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome"
- * code = #DE
+ * coding[degree] = https://mos.esante.gouv.fr/NOS/TRE_R48-DiplomeEtatFrancais/FHIR/TRE-R48-DiplomeEtatFrancais#DE05
+ * coding[degreeType] = https://mos.esante.gouv.fr/NOS/TRE_R14-TypeDiplome/FHIR/TRE-R14-TypeDiplome#DE
* period.start = "2019-03-10"
* issuer = Reference(Organization/u33)
diff --git a/input/fsh/profiles/AsPractitionerProfile.fsh b/input/fsh/profiles/AsPractitionerProfile.fsh
index 5acc6d044d..3512afa3aa 100644
--- a/input/fsh/profiles/AsPractitionerProfile.fsh
+++ b/input/fsh/profiles/AsPractitionerProfile.fsh
@@ -81,18 +81,19 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
-
-
-// ###########
-// # DIPLOME #
-// ###########
+// Qualifications
* qualification MS
-
* qualification ^slicing.discriminator.type = #pattern
* qualification ^slicing.discriminator.path = "$this"
* qualification ^slicing.rules = #open
-* qualification contains degree 0..*
+
+* qualification contains degree 0..* and exercicePro 0..1 and savoirFaire 0..*
+
+
+// ###########
+// # DIPLOME #
+// ###########
* qualification[degree] MS
@@ -126,8 +127,6 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
// # PROFESSION #
// ##############
-* qualification contains exercicePro 0..1
-
* qualification[exercicePro] ^short = "exercicePro : exercice professionnel décrivant la profession exercée, l'identité d'exercice d'un professionnel et le cadre de son exercice (civil, militaire, etc.)."
* qualification[exercicePro].code.coding ^slicing.discriminator.type = #value
@@ -154,10 +153,8 @@ Description: "Profil générique créé à partir de FrPractitioner dans le con
// # SAVOIR FAIRE #
// ################
-* qualification contains savoirFaire 0..*
-
-* qualification[savoirFaire] ^short = "savoirFAire : Prérogatives d'exercice d'un professionnel reconnues par une autorité d'enregistrement sur une période donnée de son exercice professionnel, par exemple les spécialités ordinales, etc."
+* qualification[savoirFaire] ^short = "savoirFaire : Prérogatives d'exercice d'un professionnel reconnues par une autorité d'enregistrement sur une période donnée de son exercice professionnel, par exemple les spécialités ordinales, etc."
* qualification[savoirFaire].code.coding ^slicing.discriminator.type = #value
* qualification[savoirFaire].code.coding ^slicing.discriminator.path = "system"
From e2aa98273f43eedaa62336a2701df7287b92136b Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 2 Jul 2024 16:02:31 +0200
Subject: [PATCH 26/27] correct error
---
input/fsh/examples/DR/PP16DR-Organization.fsh | 2 +-
input/fsh/examples/DR/PP16DR-Practitioner.fsh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/input/fsh/examples/DR/PP16DR-Organization.fsh b/input/fsh/examples/DR/PP16DR-Organization.fsh
index 51bafb4294..4bd4107097 100644
--- a/input/fsh/examples/DR/PP16DR-Organization.fsh
+++ b/input/fsh/examples/DR/PP16DR-Organization.fsh
@@ -47,7 +47,7 @@ Usage: #example
* system = #email
* value = "xxxx@xxxxx.mssante.fr"
* extension[emailType].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R256-TypeMessagerie/FHIR/TRE-R256-TypeMessagerie#MSSANTE
- * extension[as-mailbox-mss-metadata].extension[type] = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#ORG
+ * extension[as-mailbox-mss-metadata].extension[type].valueCodeableConcept = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#ORG
// Nom
diff --git a/input/fsh/examples/DR/PP16DR-Practitioner.fsh b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
index 0d05fc1cf3..c1e51a8db0 100644
--- a/input/fsh/examples/DR/PP16DR-Practitioner.fsh
+++ b/input/fsh/examples/DR/PP16DR-Practitioner.fsh
@@ -113,7 +113,7 @@ Usage: #example
* system = #email
* value = "davidchatelier@pro.mssante.fr"
* extension[emailType].valueCoding = https://mos.esante.gouv.fr/NOS/TRE_R256-TypeMessagerie/FHIR/TRE-R256-TypeMessagerie#MSSANTE
- * extension[as-mailbox-mss-metadata].extension[type] = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#PER
+ * extension[as-mailbox-mss-metadata].extension[type].valueCodeableConcept = https://mos.esante.gouv.fr/NOS/TRE_R257-TypeBAL/FHIR/TRE-R257-TypeBAL#PER
// Qualification
* qualification[degree][0]
From 461c62b7ab28196f08a93d05ce8e8d773adecf33 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:25:48 +0200
Subject: [PATCH 27/27] add note
---
input/pagecontent/index.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index 9170839547..6b145dfef4 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -52,6 +52,10 @@ Une mise en équivalence entre les ressources FHIR de HL7 et les concepts du Mod
* [Documentation API FHIR Annuaire Santé en libre accès](https://ansforge.github.io/annuaire-sante-fhir-documentation/)
* [Démonstration](https://portail.openfhir.annuaire.sante.fr/)
+### Note
+
+Les exemples associés aux profils au sein de ce guide sont donnés à titre indicatifs et pourront évoluer dans le temps, ils n'ont pas valeur de référence.
+
### Dépendances
{% include dependency-table.xhtml %}