Fix on extension

ansforge · Jun 3, 2024 · 39d2715 · 39d2715
1 parent 3adf11e
commit 39d2715
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/input/fsh/extensions/ServiceType.fsh b/input/fsh/extensions/ServiceType.fsh
@@ -10,4 +10,4 @@ Description: "Test extension R5"
 
 
 * extension[concept].value[x]  only CodeableConcept
-* extension[reference].value[x]  only Reference(FrHealthcareServiceAgregateurCPTS)
+* extension[reference].value[x]  only Reference(HealthcareService)
diff --git a/input/fsh/profiles/FrHealthcareServiceAgregateurCPTS.fsh b/input/fsh/profiles/FrHealthcareServiceAgregateurCPTS.fsh
@@ -0,0 +1,9 @@
+Profile: FrHealthcareServiceAgregateurCPTS
+Parent: FrHealthcareService
+Id: sas-cpts-healthcareservice-aggregator
+
+* identifier 1..1 MS
+* providedBy 1..1 MS
+* providedBy only Reference(FrOrganizationAgregateurCPTS)
+
+
diff --git a/input/fsh/profiles/FrOrganizationAgregateurCPTS.fsh b/input/fsh/profiles/FrOrganizationAgregateurCPTS.fsh
@@ -0,0 +1,15 @@
+Profile: FrOrganizationAgregateurCPTS
+Parent: FrOrganization
+Id: sas-sos-organization-aggregator
+
+* identifier 1..1
+* identifier.type = $fr-location-identifier-type#IDNST
+* identifier.system = "urn:oid:1.2.250.1.71.4.2.2"
+* identifier obeys FINESS-invariant
+* name 0..1 MS
+* telecom 0..* MS 
+
+Invariant:   FINESS-invariant
+Description: "Le numéro FINESS doit être préfixé par 1 suivi de 9 caractères numériques"
+Expression:  "value.matches('^3[0-9]{9}$')"
+Severity:    #error
diff --git a/input/fsh/profiles/FrOrganizationAgregateurSOS.fsh b/input/fsh/profiles/FrOrganizationAgregateurSOS.fsh
@@ -1,11 +1,13 @@
 Profile: FrOrganizationAgregateurSOS
 Parent: FrOrganization
-Id: sas-sos-organization-aggregator
+Id: sas-cpts-organization-aggregator
+
 * identifier 1..1
 * identifier.type = $fr-location-identifier-type#IDNST
 * identifier.system = "urn:oid:1.2.250.1.71.4.2.2"
 * identifier obeys SIRET-invariant
 
+
 Invariant:   SIRET-invariant
 Description: "Le numéro SIRET doit être préfixé par 3 suivi de 14 caractères numériques"
 Expression:  "value.matches('^3[0-9]{14}$')"

diff --git a/input/fsh/profiles/FrScheduleAgregateur.fsh b/input/fsh/profiles/FrScheduleAgregateur.fsh
@@ -6,6 +6,7 @@ Description: "Profil de Schedule, dérivé de FrSchedule, pour le service d'agr
 * ^version = "1.0"
 * ^date = "2021-06-14"
 * ^publisher = "ANS"
+
 * actor only Reference(FrPractitionerRoleExerciceAgregateur or FrPractitionerAgregateur)
 * actor ^type.aggregation[0] = #referenced
 * actor ^type.aggregation[+] = #bundled
diff --git a/input/fsh/profiles/FrSlotAgregateurCPTS.fsh b/input/fsh/profiles/FrSlotAgregateurCPTS.fsh
@@ -28,5 +28,5 @@ Description: "Profil de Slot, dérivé de FrSlot, pour le service d'agrégation
 
 * appointmentType.coding from sas-sos-valueset-appointmentreason (required)
 // vérifier si référence à ce profil ou nouveau profil CPTS
-* schedule only Reference(FrScheduleAgregateurSOS)
+* schedule only Reference(FrScheduleAgregateur)
 * status = #free
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ Description: "Test extension R5"


		* extension[concept].value[x] only CodeableConcept
		* extension[reference].value[x] only Reference(FrHealthcareServiceAgregateurCPTS)
		* extension[reference].value[x] only Reference(HealthcareService)