Skip to content

Commit 6c26ce4

Browse files
HaouraHaoura
committed
fixConflicts
2 parents eac4888 + 0abaf5b commit 6c26ce4

13 files changed

Lines changed: 31 additions & 28 deletions

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMAllergyIntolerance.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Logical: FRLMAllergyIntolerance
22
Id: fr-lm-allergy-intolerance
33
Parent: FRLMEntry
44
Title: "Logical model - FR LM Allergy Intolerance"
5-
Description: """Modèle logique métier - FR LM Allergie ou Hypersensibilité"""
5+
Description: """Entrée Allergie ou Hypersensibilité"""
66
Characteristics: #can-be-target
77

88
* type 1..1 CodeableConcept "Allergie / hypersensibilité non allergique / intolérance / idiosyncrasie"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMAntecedentFamilialObserve.fsh‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMAssessment.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Logical: FRLMAssessment
22
Id: fm-lm-assessment
33
Title: "Logical model - FR LM Assessment"
4-
Description: """Evaluation"""
4+
Description: """Entrée Evaluation"""
55
Characteristics: #can-be-target
66

77
* status 1..1 code "Statut de l'évaluation"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMCarePlan.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Logical: FRLMCarePlan
22
Id: fr-lm-care-plan
33
Parent: FRLMEntry
44
Title: "Logical model - FR LM Care Plan"
5-
Description: """Plan de soins"""
5+
Description: """Entrée Plan de soins"""
66
Characteristics: #can-be-target
77

88
* status 1..1 CodeableConcept "Statut du plan de soin (projet, actif, suspendu, annulé, terminé, erreur, inconnu)"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMDeviceUse.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Logical: FRLMDeviceUse
22
Id: fr-lm-device-use
33
Parent: FRLMEntry
44
Title: "Logical model - FR LM Device use"
5-
Description: """Modèle logique métier - FR LM Dispositif médical usage"""
5+
Description: """Entrée Dispositif médical usage"""
66
Characteristics: #can-be-target
77

88
* status 1..1 CodeableConcept "Status de l'utilisation du DM (ex active, completed, etc)."

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMDoseNumber.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Logical: FRLMDoseNumber
22
Id: fr-lm-dose-number
33
Title: "Logical model - FR LM Dose Number"
4-
Description: """Rang de la vaccination"""
4+
Description: """Entrée Rang de la vaccination"""
55
Characteristics: #can-be-target
66

77
* identifiantRangVaccination 0..* Identifier "Identifiant de l’entrée"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMFamilyMemberHistory.fsh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Logical: FRLMFamilyMemberHistory
2+
Id: fr-lm-family-member-history
3+
Parent: FRLMEntry
4+
Title: "Logical model - FR LM Family Member History"
5+
Description: "Entrée Antécédent familial"
6+
Characteristics: #can-be-target
7+
8+
* statut 1..1 code "Statut de l'observation"
9+
* ^binding.description = "Statut de l'entrée provenant du jdv FHIR https://hl7.org/fhir/R4/valueset-history-status"
10+
* ^binding.valueSet = "https://hl7.org/fhir/R4/valueset-history-status.html"
11+
* relatedPerson 1..1 FRLMSujet "Membre de la famille"
12+
* condition 0..* BackboneElement "Problème du membre de la famille"
13+
* code 1..1 CodeableConcept "Problème du membre de la famille"
14+
* outcome 0..1 CodeableConcept "mort(e) | incapacité ; sévère | etc."
15+
* ^binding.description = "Statut provenant du jdv-health-status-code-cisis (1.2.250.1.213.1.1.4.2.283.1)"
16+
* ^binding.valueSet = "https://smt.esante.gouv.fr/fhir/ValueSet/jdv-health-status-code-cisis"
17+
* contributedToDeath 0..1 boolean "problème cause du décès (O/N)"
18+
* onset[x] 0..1 dateTime or Period "Date du problème"
19+
* bodySite 0..1 CodeableConcept "Site de l'observation"
20+
* note 0..1 string "Commentaire"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMImmunisation.fsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ Logical: FRLMImmunisation
22
Id: fr-lm-immunisation
33
Parent: FRLMEntry
44
Title: "Logical model - FR LM Immunisation"
5-
Description: """Vaccination"""
5+
Description: """Entrée Vaccination"""
66
Characteristics: #can-be-target
77

8-
// Statut de la vaccination
98
* status 1..1 code "Statut de la vaccination (réalisé, non fait, ...)."
109

1110
* periodOfImmunisation 1..1 period "Période de vaccination - Si vaccin effectuée => que la dateDebutVaccination est renseignée - Si vaccin à effectuer => dateDebutVaccination et dateFinVaccination peuvent être renseignée (période souhaitée pour la vaccination)"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMMedication.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Logical: FRLMMedication
22
Id: fr-lm-medication
33
Title: "Logical model - FR LM Medication"
4-
Description: """Produit de santé"""
4+
Description: """Entrée Produit de santé"""
55
Characteristics: #can-be-target
66

77
* medicament 1..1 Base "Médicament"

‎input/fsh/ModeleLogiqueMetierCorps/composantsElementaires/FRLMObservationSocialHistory.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Logical: FRLMObservationSocialHistory
22
Id: fm-lm-observation-social-history
33
Title: "Logical model- FR LM Observation Social History"
4-
Description: """Modèle logique métier - FR LM Habitus Mode de vie"""
4+
Description: """Entrée Habitus Mode de vie"""
55
Characteristics: #can-be-target
66

77
* status 1..1 code "Statut de l'entrée"

0 commit comments

Comments
 (0)