diff --git a/input/fsh/CapabilityStatement/PDSm-ConsommateurDeDocuments.fsh b/input/fsh/CapabilityStatement/PDSm-ConsommateurDeDocuments.fsh index 06816adb0..ee974bf2d 100755 --- a/input/fsh/CapabilityStatement/PDSm-ConsommateurDeDocuments.fsh +++ b/input/fsh/CapabilityStatement/PDSm-ConsommateurDeDocuments.fsh @@ -40,7 +40,7 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le statut du lot de soumission." * rest.resource[=].searchParam[+].name = "PDSm_isArchived" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmIsArchived" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-isArchived) * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "permet distinguer les lots de soumission et les fiches archivés des actifs." * rest.resource[=].searchParam[+].name = "title" @@ -56,7 +56,7 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l’auteur du lot de soumission, quand l'auteur est de type patient, practitionerrole ou device." * rest.resource[=].searchParam[+].name = "PDSm_authorOrg" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmAuthorOrg" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-authorOrg) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l’auteur du lot de soumission, quand l'auteur est de type organization." * rest.resource[=].searchParam[+].name = "code" @@ -64,15 +64,15 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le but du lot de soumission." * rest.resource[=].searchParam[+].name = "PDSm_List_PatientAsSource" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPatientAsSource" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PatientAsSource) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur les éléments source:Patient.given et source:Patient.family." * rest.resource[=].searchParam[+].name = "PDSm_List_PatientAsSubject" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPatientAsSubject" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PatientAsSubject) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur l'élément subject:Patient.identifier." * rest.resource[=].searchParam[+].name = "PDSm_List_PractitionerRoleAsSource" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPractitionerRoleAsSource" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PractitionerRoleAsSource) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur les éléments source:PractitionerRole.practitioner:Practitioner.given et source:PractitionerRole.practitioner:Practitioner.family." @@ -107,15 +107,15 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le statut de la fiche d'un document." * rest.resource[=].searchParam[+].name = "PDSm_isArchived" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmIsArchived" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-isArchived) * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "permet distinguer les lots de soumission et les fiches archivés des actifs." * rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_period-start" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePeriodStart" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-DocumentReference-period-start) * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la date de début de l’acte de référence." * rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_period-end" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePeriodEnd" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-DocumentReference-period-end) * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la date de fin de l’acte de référence." * rest.resource[=].searchParam[+].name = "format" @@ -138,23 +138,16 @@ Usage: #definition * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-period" * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la période." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PatientAsSubject" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePatientAsSubject" + +* rest.resource[=].searchParam[+].name = "DocumentReference Patient" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-subject" * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l'identifiant du patient qui est le sujet du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_DeviceAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferenceDeviceAsAuthor" -* rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant du dispositif médical qui est l'auteur du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PatientAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePatientAsAuthor" -* rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant, le nom, le prénom du patient qui est l'auteur du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PractitionerRoleAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePractitionerRoleAsAuthor" -* rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant, le nom, le prénom du praticien dans sa situation d'exercice qui est l'auteur du document." +* rest.resource[=].searchParam[+].name = "DocumentRefence Author" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-author" +* rest.resource[=].searchParam[=].type = #reference +* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant de l'auteur qui est l'auteur du document." // Binary resource * rest.resource[+].type = #Binary diff --git a/input/fsh/CapabilityStatement/PDSm-GestionnaireDePartageDeDocuments.fsh b/input/fsh/CapabilityStatement/PDSm-GestionnaireDePartageDeDocuments.fsh index 4f3fb902d..29c26b418 100755 --- a/input/fsh/CapabilityStatement/PDSm-GestionnaireDePartageDeDocuments.fsh +++ b/input/fsh/CapabilityStatement/PDSm-GestionnaireDePartageDeDocuments.fsh @@ -40,7 +40,7 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le statut du lot de soumission." * rest.resource[=].searchParam[+].name = "PDSm_isArchived" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmIsArchived" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-isArchived) * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "permet distinguer les lots de soumission et les fiches archivés des actifs." * rest.resource[=].searchParam[+].name = "title" @@ -51,28 +51,32 @@ Usage: #definition * rest.resource[=].searchParam[=].definition = "https://profiles.ihe.net/ITI/MHD/SearchParameter/List-SourceId" * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente l’identifiant unique global du système émetteur du lot de soumission." + * rest.resource[=].searchParam[+].name = "source" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/List-source" * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l’auteur du lot de soumission, quand l'auteur est de type patient, practitionerrole ou device." + * rest.resource[=].searchParam[+].name = "PDSm_authorOrg" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmAuthorOrg" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-authorOrg) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l’auteur du lot de soumission, quand l'auteur est de type organization." + * rest.resource[=].searchParam[+].name = "code" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-code" * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le but du lot de soumission." + * rest.resource[=].searchParam[+].name = "PDSm_List_PatientAsSource" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPatientAsSource" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PatientAsSource) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur les éléments source:Patient.given et source:Patient.family." * rest.resource[=].searchParam[+].name = "PDSm_List_PatientAsSubject" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPatientAsSubject" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PatientAsSubject) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur l'élément subject:Patient.identifier." * rest.resource[=].searchParam[+].name = "PDSm_List_PractitionerRoleAsSource" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmListPractitionerRoleAsSource" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-List-PractitionerRoleAsSource) * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Recherche sur les éléments source:PractitionerRole.practitioner:Practitioner.given et source:PractitionerRole.practitioner:Practitioner.family." @@ -109,15 +113,15 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "Représente le statut de la fiche d'un document." * rest.resource[=].searchParam[+].name = "PDSm_isArchived" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmIsArchived" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-isArchived) * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[=].documentation = "permet distinguer les lots de soumission et les fiches archivés des actifs." * rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_period-start" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePeriodStart" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-DocumentReference-period-start) * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la date de début de l’acte de référence." * rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_period-end" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePeriodEnd" +* rest.resource[=].searchParam[=].definition = Canonical(PDSm-DocumentReference-period-end) * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la date de fin de l’acte de référence." * rest.resource[=].searchParam[+].name = "format" @@ -140,22 +144,16 @@ Usage: #definition * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-period" * rest.resource[=].searchParam[=].type = #date * rest.resource[=].searchParam[=].documentation = "Représente la période." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PatientAsSubject" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePatientAsSubject" + +* rest.resource[=].searchParam[+].name = "DocumentReference Patient" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-subject" * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[=].documentation = "Représente l'identifiant du patient qui est le sujet du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_DeviceAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferenceDeviceAsAuthor" -* rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant du dispositif médical qui est l'auteur du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PatientAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePatientAsAuthor" -* rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant, le nom, le prénom du patient qui est l'auteur du document." -* rest.resource[=].searchParam[+].name = "PDSm_DocumentReference_PractitionerRoleAsAuthor" -* rest.resource[=].searchParam[=].definition = "https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSmDocumentReferencePractitionerRoleAsAuthor" + +* rest.resource[=].searchParam[+].name = "DocumentRefence Author" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/DocumentReference-author" * rest.resource[=].searchParam[=].type = #reference -* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant, le nom, le prénom du praticien dans sa situation d'exercice qui est l'auteur du document." +* rest.resource[=].searchParam[=].documentation = "Représente l'identifiant de l'auteur qui est l'auteur du document." // Binary resource * rest.resource[+].type = #Binary diff --git a/input/fsh/SearchParameter/PDSm-DocumentReference-PatientAsSubject.fsh b/input/fsh/SearchParameter/PDSm-DocumentReference-PatientAsSubject.fsh deleted file mode 100755 index 757e69982..000000000 --- a/input/fsh/SearchParameter/PDSm-DocumentReference-PatientAsSubject.fsh +++ /dev/null @@ -1,21 +0,0 @@ -Instance: PDSm-DocumentReference-PatientAsSubject -InstanceOf: SearchParameter -Usage: #definition -* name = "PDSmDocumentReferencePatientAsSubject" -* derivedFrom = "http://hl7.org/fhir/SearchParameter/clinical-patient" -* status = #active -// * date = "2021-10-21T14:07:55.2305535+00:00" -* publisher = "ANS" -* description = "Paramètre de recherche chaîné créé pour le volet PDSm de manière à pouvoir utiliser comme critère de recherche l'élément patient.identifier" -* code = #patient -* base = #DocumentReference -* type = #reference -* expression = "DocumentReference.subject.where(resolve() is Patient)" -* xpath = "f:DocumentReference/f:subject" -* xpathUsage = #normal -* multipleOr = true -* multipleAnd = true -* modifier[0] = #missing -* modifier[+] = #type -* modifier[+] = #identifier -* chain = "identifier" \ No newline at end of file diff --git a/input/fsh/SearchParameter/PDSm-DocumentReference-PractitionerRoleAsAuthor.fsh b/input/fsh/SearchParameter/PDSm-DocumentReference-PractitionerRoleAsAuthor.fsh deleted file mode 100755 index da522027f..000000000 --- a/input/fsh/SearchParameter/PDSm-DocumentReference-PractitionerRoleAsAuthor.fsh +++ /dev/null @@ -1,23 +0,0 @@ -Instance: PDSm-DocumentReference-PractitionerRoleAsAuthor -InstanceOf: SearchParameter -Usage: #definition -* name = "PDSmDocumentReferencePractitionerRoleAsAuthor" -* derivedFrom = "http://hl7.org/fhir/SearchParameter/DocumentReference-author" -* status = #active -* date = "2021-10-21T14:14:41.3948746+00:00" -* publisher = "ANS" -* description = "Paramètre de recherche chaîné créé pour le volet PDSm de manière à pouvoir utiliser comme critère de recherche l'élément author:PractitionerRole.practitioner:Practitioner.identifier, author:PractitionerRole.practitioner:Practitioner.given et author:PractitionerRole.practitioner:Practitioner.family" -* code = #author -* base = #DocumentReference -* type = #reference -* expression = "DocumentReference.author" -* xpath = "f:DocumentReference/f:author" -* xpathUsage = #normal -* target = #PractitionerRole -* multipleOr = true -* multipleAnd = true -* chain[0] = "partOf.practitioner.identifier" -* chain[+] = "partOf.practitioner.given" -* chain[+] = "partOf.practitioner.family" -* chain[+] = "partOf.givenEx" -* chain[+] = "partOf.familyEx" \ No newline at end of file diff --git a/input/fsh/SearchParameter/PDSm-isArchived.fsh b/input/fsh/SearchParameter/PDSm-isArchived.fsh index 829fed581..fd047dbc1 100755 --- a/input/fsh/SearchParameter/PDSm-isArchived.fsh +++ b/input/fsh/SearchParameter/PDSm-isArchived.fsh @@ -10,4 +10,4 @@ Usage: #definition * base[0] = #DocumentReference * base[+] = #List * type = #token -* expression = "(extension('https://interop.esante.gouv.fr/ig/fhir/pdsm/SearchParameter/PDSm-isArchived').value as Boolean)" \ No newline at end of file +* expression = "(extension('https://interop.esante.gouv.fr/ig/fhir/pdsm/StructureDefinition/pdsm-ext-is-archived').value as Boolean)" \ No newline at end of file