Skip to content

Commit

Permalink
Merge branch 'main' into ft/#3-add-narative
Browse files Browse the repository at this point in the history
  • Loading branch information
nriss committed Feb 13, 2024
2 parents 5f97fc8 + 6e4800f commit a45b7bd
Showing 17 changed files with 58 additions and 107 deletions.
10 changes: 10 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Description des changements

* [changement 1]
* [changement 2]
* ...

## Preview

https://ansforge.github.io/IG-fhir-cercle-de-soins/ig/[ajouter_nom_de_la_branche]

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ input-cache/schemas/
# input-cache/txcache/
input-cache/*

local-template
local-template/*

# OS generated files #
######################
Thumbs.db
Binary file removed classnotes/Using the HL7 IG Publisher.docx
Binary file not shown.
27 changes: 0 additions & 27 deletions classnotes/cibuild.txt

This file was deleted.

5 changes: 1 addition & 4 deletions input/fsh/aliases.fsh
Original file line number Diff line number Diff line change
@@ -2,7 +2,4 @@ Alias: $FrRelatedPerson = http://interopsante.org/fhir/StructureDefinition/FrRel
Alias: $IHE_DCTM_CareTeam = http://ihe.net/fhir/StructureDefinition/IHE_DCTM_CareTeam
Alias: $FrPatient = http://interopsante.org/fhir/StructureDefinition/FrPatient
Alias: $FrOrganization = http://interopsante.org/fhir/StructureDefinition/FrOrganization
Alias: $practitionerRole-organizationalRole-rass = https://apifhir.annuaire.sante.fr/ws-sync/exposed/structuredefinition/practitionerRole-organizationalRole-rass
Alias: $practitionerRole-professionalRole-rass = https://apifhir.annuaire.sante.fr/ws-sync/exposed/structuredefinition/practitionerRole-professionalRole-rass
Alias: $FrPractitioner = http://interopsante.org/fhir/StructureDefinition/FrPractitioner
Alias: $mailboxMSS = https://apifhir.annuaire.sante.fr/ws-sync/exposed/structuredefinition/mailboxMSS
Alias: $FrPractitioner = http://interopsante.org/fhir/StructureDefinition/FrPractitioner
4 changes: 2 additions & 2 deletions input/fsh/instances/Consommateur.fsh
Original file line number Diff line number Diff line change
@@ -153,8 +153,8 @@ Usage: #definition
* rest.resource[=].searchParam[=].documentation = "Reference vers l'entite juridique"

* rest.resource[+].type = #PractitionerRole
* rest.resource[=].profile = $practitionerRole-professionalRole-rass
* rest.resource[=].supportedProfile = $practitionerRole-organizationalRole-rass
* rest.resource[=].profile = Canonical(as-practitioner)
* rest.resource[=].supportedProfile = Canonical(as-practitionerrole)
* rest.resource[=].interaction[0].code = #read
* rest.resource[=].interaction[+].code = #search-type
* rest.resource[=].searchParam[0].name = "_id"
5 changes: 2 additions & 3 deletions input/fsh/instances/CreateurRestful.fsh
Original file line number Diff line number Diff line change
@@ -23,13 +23,12 @@ Usage: #definition
* rest.resource[=].interaction[+].code = #update

* rest.resource[+].type = #Practitioner
* rest.resource[=].profile = $FrPractitioner
* rest.resource[=].profile = Canonical(as-practitioner)
* rest.resource[=].interaction[0].code = #create
* rest.resource[=].interaction[+].code = #update

* rest.resource[+].type = #PractitionerRole
* rest.resource[=].profile = $practitionerRole-organizationalRole-rass
* rest.resource[=].supportedProfile = $practitionerRole-professionalRole-rass
* rest.resource[=].profile = Canonical(as-practitionerrole)
* rest.resource[=].interaction[0].code = #create
* rest.resource[=].interaction[+].code = #update

5 changes: 2 additions & 3 deletions input/fsh/instances/Gestionnaire.fsh
Original file line number Diff line number Diff line change
@@ -140,15 +140,14 @@ Usage: #definition
* rest.resource[=].searchParam[=].documentation = "Relation entre le patient et la personne de confiance"
// Practitioner resource
* rest.resource[+].type = #Practitioner
* rest.resource[=].profile = $FrPractitioner
* rest.resource[=].profile = Canonical(as-practitioner)
* rest.resource[=].interaction[0].code = #create
* rest.resource[=].interaction[+].code = #update
* rest.resource[=].interaction[+].code = #read
* rest.resource[=].interaction[+].code = #search-type
// PractitionerRole resource
* rest.resource[+].type = #PractitionerRole
* rest.resource[=].profile = $practitionerRole-professionalRole-rass
* rest.resource[=].supportedProfile = $practitionerRole-organizationalRole-rass
* rest.resource[=].profile = Canonical(as-practitionerrole)
* rest.resource[=].interaction[0].code = #create
* rest.resource[=].interaction[+].code = #update
* rest.resource[=].interaction[+].code = #read
35 changes: 15 additions & 20 deletions input/fsh/profiles/CDS_BundleResponseRecherche.fsh
Original file line number Diff line number Diff line change
@@ -12,9 +12,8 @@ Description: "« Bundle » de type « searchset » encapsulant une collection de
relatedPerson 0..* and
organization 0..* and
organizationInterne 0..* and
practitioneRoleOrg 0..* and
practitionerRolePro 0..* and
practitioner 0..*
practitionerRoleOrg 0..* and
practitionerPro 0..*

* entry[careTeam].resource 1..
* entry[careTeam].resource only cds-ihe-careteam
@@ -46,20 +45,16 @@ Description: "« Bundle » de type « searchset » encapsulant une collection de
* entry[organizationInterne].request ..0
* entry[organizationInterne].response ..0

* entry[practitioneRoleOrg].resource 1..
* entry[practitioneRoleOrg].resource only $practitionerRole-organizationalRole-rass
* entry[practitioneRoleOrg].search.mode = #include
* entry[practitioneRoleOrg].request ..0
* entry[practitioneRoleOrg].response ..0

* entry[practitionerRolePro].resource 1..
* entry[practitionerRolePro].resource only $practitionerRole-professionalRole-rass
* entry[practitionerRolePro].search.mode = #include
* entry[practitionerRolePro].request ..0
* entry[practitionerRolePro].response ..0

* entry[practitioner].resource 1..
* entry[practitioner].resource only $FrPractitioner
* entry[practitioner].search.mode = #include
* entry[practitioner].request ..0
* entry[practitioner].response ..0
* entry[practitionerRoleOrg] ^short = "Situation d'exercice du PS (PractitionerRole)"
* entry[practitionerRoleOrg].resource 1..
* entry[practitionerRoleOrg].resource only as-practitionerrole
* entry[practitionerRoleOrg].search.mode = #include
* entry[practitionerRoleOrg].request ..0
* entry[practitionerRoleOrg].response ..0

* entry[practitionerPro] ^short = "Exercice professionnel du PS (Practitioner)"
* entry[practitionerPro].resource 1..
* entry[practitionerPro].resource only as-practitioner
* entry[practitionerPro].search.mode = #include
* entry[practitionerPro].request ..0
* entry[practitionerPro].response ..0
20 changes: 8 additions & 12 deletions input/fsh/profiles/CDS_BundleTransactionCreation.fsh
Original file line number Diff line number Diff line change
@@ -14,8 +14,7 @@ Il s'agit d'un bundle de type `transaction` permettant d'organiser le contenu du
organization 0..* and
organizationInterne 0..* and
practitionerRoleOrg 0..* and
practitionerRolePro 0..* and
practitioner 0..*
practitionerPro 0..*

* entry[careTeam].resource 1..
* entry[careTeam].resource only cds-ihe-careteam
@@ -42,17 +41,14 @@ Il s'agit d'un bundle de type `transaction` permettant d'organiser le contenu du
* entry[organizationInterne].request.method obeys req-met
* entry[organizationInterne].response ..0

* entry[practitionerRoleOrg] ^short = "Situation d'exercice du PS (PractitionerRole)"
* entry[practitionerRoleOrg].resource 1..
* entry[practitionerRoleOrg].resource only $practitionerRole-organizationalRole-rass
* entry[practitionerRoleOrg].resource only as-practitionerrole
* entry[practitionerRoleOrg].request.method obeys req-met
* entry[practitionerRoleOrg].response ..0

* entry[practitionerRolePro].resource 1..
* entry[practitionerRolePro].resource only $practitionerRole-professionalRole-rass
* entry[practitionerRolePro].request.method obeys req-met
* entry[practitionerRolePro].response ..0

* entry[practitioner].resource 1..
* entry[practitioner].resource only $FrPractitioner
* entry[practitioner].request.method obeys req-met
* entry[practitioner].response ..0
* entry[practitionerPro] ^short = "Exercice professionnel du PS (Practitioner)"
* entry[practitionerPro].resource 1..
* entry[practitionerPro].resource only as-practitioner
* entry[practitionerPro].request.method obeys req-met
* entry[practitionerPro].response ..0
20 changes: 8 additions & 12 deletions input/fsh/profiles/CDS_BundleTransactionMAJ.fsh
Original file line number Diff line number Diff line change
@@ -15,8 +15,7 @@ Il s'agit d'un bundle de type "transaction" permettant d'organiser le contenu du
organization 0..* and
organizationInterne 0..* and
practitionerRoleOrg 0..* and
practitionerRolePro 0..* and
practitioner 0..*
practitionerPro 0..*

* entry[careTeam].resource 1..
* entry[careTeam].resource only cds-ihe-careteam
@@ -43,17 +42,14 @@ Il s'agit d'un bundle de type "transaction" permettant d'organiser le contenu du
* entry[organizationInterne].request.method obeys req-met
* entry[organizationInterne].response ..0

* entry[practitionerRoleOrg] ^short = "Situation d'exercice du PS (PractitionerRole)"
* entry[practitionerRoleOrg].resource 1..
* entry[practitionerRoleOrg].resource only $practitionerRole-organizationalRole-rass
* entry[practitionerRoleOrg].resource only as-practitionerrole
* entry[practitionerRoleOrg].request.method obeys req-met
* entry[practitionerRoleOrg].response ..0

* entry[practitionerRolePro].resource 1..
* entry[practitionerRolePro].resource only $practitionerRole-professionalRole-rass
* entry[practitionerRolePro].request.method obeys req-met
* entry[practitionerRolePro].response ..0

* entry[practitioner].resource 1..
* entry[practitioner].resource only $FrPractitioner
* entry[practitioner].request.method obeys req-met
* entry[practitioner].response ..0
* entry[practitionerPro] ^short = "Exercice professionnel du PS (Practitioner)"
* entry[practitionerPro].resource 1..
* entry[practitionerPro].resource only as-practitioner
* entry[practitionerPro].request.method obeys req-met
* entry[practitionerPro].response ..0
2 changes: 1 addition & 1 deletion input/fsh/profiles/CDS_IHECareTeam.fsh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Description: "Profil héritant du profil défini dans DCTM et défini pour le vo
* participant ^comment = "It is possible for a care team to be set up with roles specified only, before actual participants are invited into or identified as team members"
* participant.member 1..
* participant.member ^requirements = "Need to know who the member is if participant is required.\r\nThis version of the profile requires that a DynamicCareTeam be referenced when the member is a care team."
* participant.member only Reference($practitionerRole-organizationalRole-rass or cds-fr-related-person or $FrOrganization or cds-organization-orga-int)
* participant.member only Reference(as-practitionerrole or cds-fr-related-person or $FrOrganization or cds-organization-orga-int)
* participant.member ^short = "Il s’agit d’une personne (Professionnel ou Personne Tierce) ou d’une Entité qui fait partie du Cercle de Soins d’un Usager"
* participant.period ^comment = "This version of the profile requires period to indicate how current the participant is."
* participant.period.start 1..
7 changes: 2 additions & 5 deletions input/fsh/profiles/CDS_Organization-OrgaInt.fsh
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
Profile: CDSOrganizationOrgaInt
Parent: Organization //TODO : héritage annuaire / IS ?
Parent: as-organization
Id: cds-organization-orga-int
Description: "Profil héritant de la ressource FHIR pour les organisations internes."
* id 1..
* meta 1..
* extension ^slicing.discriminator.type = #value
* extension ^slicing.discriminator.path = "url"
* extension ^slicing.rules = #open
* extension contains $mailboxMSS named MailboxMSS 0..*

* identifier ..1
* telecom 1..
* partOf 1..
Binary file removed local-template/content/assets/images/SampleLogo.png
Binary file not shown.
3 changes: 0 additions & 3 deletions local-template/includes/_append.fragment-header.html

This file was deleted.

13 changes: 0 additions & 13 deletions local-template/package/package.json

This file was deleted.

6 changes: 4 additions & 2 deletions sushi-config.yaml
Original file line number Diff line number Diff line change
@@ -12,10 +12,12 @@ version: 0.1.0 # shall conforms to Semantic Versioning https://fr.wiktionary.org
fhirVersion: 4.0.1
copyrightYear: 2020+
releaseLabel: ci-build
jurisdiction: urn:iso:std:iso:3166#FR "FRANCE"

dependencies:
ans.annuaire.fhir.r4: 0.2.0
ans.fhir.fr.annuaire: 1.0.0-ballot-3
hl7.fhir.fr.core: 1.1.0
ans.fr.nos: latest

parameters:
shownav: 'true'
@@ -55,4 +57,4 @@ menu:
Téléchargements et usage: downloads.html
"Spécifications FHIR ": new-tab {{site.data.fhir.path}}index.html
"Site de l'ANS ": new-tab https://esante.gouv.fr/
A propos de ce guide: about.html
A propos de ce guide: about.html

0 comments on commit a45b7bd

Please sign in to comment.