Merge pull request #90 from IleniaCentonze/master

QA error fixing

Author: LeonardoAlcaro

input/fsh/examples/diagnosticreport_micro.fsh

@@ -10,48 +10,100 @@ Usage: #example
 * timestamp = "2023-02-25T14:30:00+01:00"
 * entry[+].fullUrl = "/DiagnosticReport" //urn:uuid:56f19992-e73e-45b5-bbdd-6d9aeb60b15a
 * entry[=].resource = DiagnosticReport-Lab-Esempio2
+* entry[=].request.method = #POST
+* entry[=].request.url = "/DiagnosticReport"
 * entry[+].fullUrl = "/Observation/1"
 * entry[=].resource = Inline-Observation-org-id2-susc-2
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/2"
 * entry[=].resource = Inline-Observation-gs-org2
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/3"
 * entry[=].resource = Inline-Observation-aerobic-culture
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl =  "/Observation/4"
 * entry[=].resource = Inline-Observation-wbc
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl =  "/Observation/5"
 * entry[=].resource = Inline-Observation-gram-stain
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl =  "/Observation/6"
 * entry[=].resource = Inline-Observation-org-id1-susc-panel
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/7"
 * entry[=].resource = Inline-Observation-org-id2
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl =  "/Observation/8"
 * entry[=].resource = Inline-Observation-org-id2-susc-panel
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/9"
 * entry[=].resource = Inline-Observation-org-id2-susc-1
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl =  "/Observation/10"
 * entry[=].resource = Inline-Observation-gs-org1
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/11"
 * entry[=].resource = Inline-Observation-org-id1-susc-3
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/12"
 * entry[=].resource = Inline-Observation-org-id1-susc-1
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/13"
 * entry[=].resource = Inline-Observation-org-id1
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/14"
 * entry[=].resource = Inline-Observation-org-id1-susc-4
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/15"
 * entry[=].resource = Inline-Observation-gs-org1-quant
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/16"
 * entry[=].resource = Inline-Observation-org-id1-growth
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/17"
 * entry[=].resource = Inline-Observation-org-id2-susc-4
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/18"
 * entry[=].resource = Inline-Observation-org-id1-susc-2
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/19"
 * entry[=].resource = Inline-Observation-anaerobic-culture
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/20"
 * entry[=].resource = Inline-Observation-org-id2-growth
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 * entry[+].fullUrl = "/Observation/21"
 * entry[=].resource = Inline-Observation-gs-org2-quant
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
+* entry[+].fullUrl = "/Observation/22"
+* entry[=].resource = Inline-Observation-gs-org2-quant
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
+* entry[+].fullUrl = "/Observation/23"
+* entry[=].resource = Inline-Observation-org-id2-susc-3
+* entry[=].request.method = #POST
+* entry[=].request.url = "/Observation"
 
 Instance: DiagnosticReport-Lab-Esempio2
 InstanceOf: diagnosticreport-it-lab
@@ -76,9 +128,9 @@ Description: "Esempio di Observation: rilevazione della colorazione di gram su c
 
 * id = "333b62b2-47b0-43b5-9745-abec1f0c4656"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#664-3 "Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
+* code = $LOINC#664-3 //"Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
 * code.text = "Gram Stain"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
@@ -97,7 +149,7 @@ Usage: #inline
 * id = "2b209d21-dc7b-4267-a089-d3b61667945a"
 * status = #final
 * category[+] = $observation-category#laboratory
-* code = $LOINC#72163-9 "Colorazione di Gram Ematologia (coagulazione) conta differenziale Presenza o Soglia Punto nel tempo (episodio)"
+* code = $LOINC#72163-9 //"Colorazione di Gram Ematologia (coagulazione) conta differenziale Presenza o Soglia Punto nel tempo (episodio)"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -110,9 +162,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "516884c4-8a1f-4e5b-8492-a7dd190f1fb0"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#664-3 "Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
+* code = $LOINC#664-3 //"Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -126,7 +178,7 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "9018b020-6e21-4afa-9131-5832132092c1"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
 * code.text = "Quantità osservata"
 * subject = Reference(Paziente-SSN)
@@ -141,9 +193,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "25c5aa73-387d-4b80-9245-8e1adfa470f5"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#664-3 "Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
+* code = $LOINC#664-3 //"Colorazione di Gram Microbiologia Presenza o Identità Punto nel tempo (episodio)"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -157,7 +209,7 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "f2e48d96-a153-46b3-a15b-58b5aa761853"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
 * code.text = "Quantità osservata"
 * subject = Reference(Paziente-SSN)
@@ -173,9 +225,10 @@ Usage: #inline
 Description: "Esempio di Observation: rilevazione coltura aerobica da campione di sangue."
 * id = "297c84f2-28d6-41b5-a270-6f563ef0fdfc"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#LP6103-8 "Coltura Aerobica"
+* code = $LOINC#17898-8
+ //"Coltura Aerobica"
 * code.text = "Coltura Aerobica"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
@@ -189,9 +242,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "6b103ad8-1870-45bb-884a-86675ad404f1"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#634-6 "Coltura aerobi Microbiologia Presenza o Identità (episodio)"
+* code = $LOINC#634-6 //"Coltura aerobi Microbiologia Presenza o Identità (episodio)"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -205,7 +258,7 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "a99f7742-c77d-4650-918b-1e9a6e28cefd"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
 * code.text = "Crescita di microrganismi"
 * subject = Reference(Paziente-SSN)
@@ -220,9 +273,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "31747c3c-0a07-4937-9529-378140609e96"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#29576-6 "Suscettibilità batterica, panel"
+* code = $LOINC#29576-6 //"Suscettibilità batterica, panel"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -238,9 +291,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "652d16a5-91d9-40fb-9c5c-3950683e5d9f"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18900-1 "Cefalotina [Suscettibilità agli antibiotici]"
+* code = $LOINC#18900-1 //"Cefalotina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -256,9 +309,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "ccf32a29-d9f5-435a-9c67-e59d7104adff"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#20629-2 "Levofloxacina [Suscettibilità agli antibiotici]"
+* code = $LOINC#20629-2 //"Levofloxacina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -274,9 +327,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "60f23552-dfb9-4142-95a2-911a41180c78"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18961-3 "Oxacillina [Suscettibilità agli antibiotici]"
+* code = $LOINC#18961-3 //"Oxacillina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -291,9 +344,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "848e01c5-1565-4708-92c3-304418a43a40"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#19000-9 "Vancomicina [Suscettibilità agli antibiotici]"
+* code = $LOINC#19000-9 //"Vancomicina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -309,9 +362,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "424aba49-cc38-4207-b9a0-c484062ecb26"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#634-6 "Coltura aerobi Microbiologia Presenza o Identità (episodio)"
+* code = $LOINC#634-6 //"Coltura aerobi Microbiologia Presenza o Identità (episodio)"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -325,7 +378,7 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "ed8a917b-2e94-4aa9-b824-5dceee2deb90"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
 * code.text = "Crescita di microrganismi"
 * subject = Reference(Paziente-SSN)
@@ -339,28 +392,26 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "4bc004e5-e77b-46c7-b0d5-3dfa127b48b4"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#29576-6 "Suscettibilità batterica, panel"
+* code = $LOINC#29576-6 //"Suscettibilità batterica, panel"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
-
 * hasMember[+] = Reference(Observation/4edf70e9-b332-4804-a3bf-5d1c14e9f892)
 * hasMember[+] = Reference(Observation/20e0ab9e-2ce4-431a-adfb-6a727bd49355)
-* hasMember[+] = Reference(Observation/33db08be-9853-4027-ba51-ce646bea8a76)
-* hasMember[+] = Reference(Observation/b4502905-747f-4f96-bfe0-05cc958e6510)
-
+* hasMember[+] = Reference(Observation/20e0ab9e-2ce4-431b-adfb-6a727bd49355)
+* hasMember[+] = Reference(Observation/f2831756-1436-11ee-be56-0242ac120002)
 * encounter = Reference(Encounter-Lab-Esempio)
 
 Instance: Inline-Observation-org-id2-susc-1
 InstanceOf: observation-it-lab
 Usage: #inline
 * id = "4edf70e9-b332-4804-a3bf-5d1c14e9f892"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18864-9 "Ampicillina [Suscettibilità agli antibiotici]"
+* code = $LOINC#18864-9 //"Ampicillina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -376,9 +427,9 @@ InstanceOf: observation-it-lab
 Usage: #inline
 * id = "20e0ab9e-2ce4-431a-adfb-6a727bd49355"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18906-8 "Ciprofloxacina [Suscettibilità agli antibiotici]"
+* code = $LOINC#18906-8 //"Ciprofloxacina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -392,11 +443,11 @@ Usage: #inline
 Instance: Inline-Observation-org-id2-susc-3
 InstanceOf: observation-it-lab
 Usage: #inline
-* id = "33db08be-9853-4027-ba51-ce646bea8a76"
+* id = "20e0ab9e-2ce4-431b-adfb-6a727bd49355"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18928-2 "Gentamicina [Suscettibilità agli antibiotici]"
+* code = $LOINC#18928-2 //"Gentamicina [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -410,11 +461,11 @@ Usage: #inline
 Instance: Inline-Observation-org-id2-susc-4
 InstanceOf: observation-it-lab
 Usage: #inline
-* id = "b4502905-747f-4f96-bfe0-05cc958e6510"
+* id = "f2831756-1436-11ee-be56-0242ac120002"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#18932-4 "Imipenem [Suscettibilità agli antibiotici]"
+* code = $LOINC#18932-4 //"Imipenem [Suscettibilità agli antibiotici]"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"
 * performer = Reference(PractitionerRole-Lab-Esempio)
@@ -431,9 +482,9 @@ Usage: #inline
 Description: "Esempio di Observation: rilevazione coltura anaerobi da campione di sangue."
 * id = "e271a348-4f54-4667-86ed-d9ecfb7430f6"
 * status = #final
-* category[esame-laboratorio] = $observation-category#laboratory
+* category[+] = $observation-category#laboratory
 * category[+] = $v2-0074#MB "Microbiology"
-* code = $LOINC#635-3 "Batteri , identificato: Coltura anaerobica"
+* code = $LOINC#635-3 //"Batteri , identificato: Coltura anaerobica"
 * code.text = "Coltura Anaerobi"
 * subject = Reference(Paziente-SSN)
 * effectiveDateTime = "2022-10-25T13:35:00+01:00"

input/fsh/examples/observationGroupEsempio.fsh

@@ -1,5 +1,5 @@
 Instance: Observation-Lab-Esempio-Group
-InstanceOf: observation-it-lab
+InstanceOf: observation-grouping-it-lab
 Usage: #example
 Description: "Esempio di contenitore per Battery Test: rilevazione di glucosio nel sangue."
 
@@ -14,7 +14,7 @@ Description: "Esempio di contenitore per Battery Test: rilevazione di glucosio n
 
 * code.coding.system = $LOINC
 * code.coding.code = #18723-7
-* code.coding.display = "Studi di ematologia"
+// * code.coding.display = "Studi di ematologia"
 
 
 * subject = Reference(Paziente-SSN)