Skip to content

Commit a1ab6c9

Browse files
committed
Fixing unsaved resolved merge conflict
1 parent 1829627 commit a1ab6c9

File tree

1 file changed

+8
-40
lines changed

1 file changed

+8
-40
lines changed
Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
<<<<<<< HEAD:input/fsh/profiles/Profile-Tyndall.fsh
2-
Profile: MII_EyeMatics_Tyndall
3-
Parent: MII_EyeMatics_OphtalmicObservation
4-
Id: mii-eyematics-tyndall
5-
Title: "Tyndall"
6-
Description: "Tyndall effect as seen during slit-lamp examination"
7-
* ^url = "https://eyematics.org/fhir/eyematics-kds/StructureDefinition/tyndall"
1+
Profile: MII_EyeMatics_Anterior_Chamber_Cells
2+
Parent: MII_EyeMatics_OphthalmicObservation
3+
Id: mii-eyematics-anterior-chamber-cells
4+
Title: "Anterior Chamber Cells"
5+
Description: "A profile to capture anterior chamber cells observations in ophthalmology."
6+
* ^url = "https://eyematics.org/fhir/eyematics-kds/StructureDefinition/AnteriorChamberCells"
87
* id MS
98
* meta MS
109
* meta.source MS
1110
* meta.profile MS
12-
* status = #final
11+
* status = #draft
1312
* code MS
1413
* code.coding MS
1514
* code.coding ^slicing.discriminator.type = #pattern
1615
* code.coding ^slicing.discriminator.path = "$this"
1716
* code.coding ^slicing.rules = #open
18-
* code.coding contains loinc 1.. MS
19-
* code.coding[loinc] = $loinc#56844-4 "Intraocular pressure of Eye"
20-
* code.coding[loinc].system 1.. MS
21-
* code.coding[loinc].code 1.. MS
2217
* code.coding contains snomed 1.. MS
2318
* code.coding[snomed] = $SCT#246993000 "Anterior chamber cells (finding)"
2419
* code.coding[snomed].system 1.. MS
@@ -27,31 +22,4 @@ Description: "Tyndall effect as seen during slit-lamp examination"
2722
* effectiveDateTime MS
2823
* value[x] MS
2924
* value[x] only CodeableConcept
30-
* valueCodeableConcept from VS_Tyndall_Grades
31-
=======
32-
Profile: MII_EyeMatics_Anterior_Chamber_Cells
33-
Parent: MII_EyeMatics_OphthalmicObservation
34-
Id: mii-eyematics-anterior-chamber-cells
35-
Title: "Anterior Chamber Cells"
36-
Description: "A profile to capture anterior chamber cells observations in ophthalmology."
37-
* ^url = "https://eyematics.org/fhir/eyematics-kds/StructureDefinition/AnteriorChamberCells"
38-
* id MS
39-
* meta MS
40-
* meta.source MS
41-
* meta.profile MS
42-
* status = #draft
43-
* code MS
44-
* code.coding MS
45-
* code.coding ^slicing.discriminator.type = #pattern
46-
* code.coding ^slicing.discriminator.path = "$this"
47-
* code.coding ^slicing.rules = #open
48-
* code.coding contains snomed 1.. MS
49-
* code.coding[snomed] = $SCT#246993000 "Anterior chamber cells (finding)"
50-
* code.coding[snomed].system 1.. MS
51-
* code.coding[snomed].code 1.. MS
52-
* effective[x] only dateTime
53-
* effectiveDateTime MS
54-
* value[x] MS
55-
* value[x] only CodeableConcept
56-
* valueCodeableConcept from VS_SUN_Cells
57-
>>>>>>> 78dde294229ed145a6c9bd0865842ac692638c52:input/fsh/profiles/Profile-AnteriorChamberCells.fsh
25+
* valueCodeableConcept from VS_SUN_Cells

0 commit comments

Comments
 (0)