IHE · JohnMoehrke · Feb 9, 2024 · Feb 9, 2024
diff --git a/input/fsh/AuthZ.fsh b/input/fsh/AuthZ.fsh
@@ -53,7 +53,9 @@ An AduitEvent recording a permit authorization decision by a Consent Decision Se
 """
 * modifierExtension 0..0
 * type = DCM#110113 // "Security Alert"
+* type 1..
 * subtype from AuthZsubTypeVS
+* subtype 1..
 * action = #E
 // subtype
 // * severity in R5
@@ -127,6 +129,7 @@ An AduitEvent recording a permit authorization decision by a Consent Decision Se
 	token 0..1
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 * entity[consent].type = http://hl7.org/fhir/resource-types#Consent // "Consent"

diff --git a/input/fsh/Disclose.fsh b/input/fsh/Disclose.fsh
@@ -17,6 +17,7 @@ Defines constraints on the AuditEvent Resource to record when a Privacy Disclosu
 - shall have a set identity entity
 """
 * modifierExtension 0..0
+* type 1..
 * type = DCM#110107 // "Import"
 * action = #C
 * insert requireAtLeastOneMatch(subtype, disclosure, http://terminology.hl7.org/CodeSystem/iso-21089-lifecycle#disclose )
@@ -59,6 +60,7 @@ Defines constraints on the AuditEvent Resource to record when a Privacy Disclosu
 	patient 1..1 
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 
@@ -89,6 +91,7 @@ Defines constraints on the AuditEvent Resource to record when a Privacy Disclosu
 """
 * modifierExtension 0..0
 * type = DCM#110106 // "Export"
+* type 1..
 * action = #R
 * insert requireAtLeastOneMatch(subtype, disclosure, http://terminology.hl7.org/CodeSystem/iso-21089-lifecycle#disclose)
 * subtype ^slicing.description = "needs to at least be a disclosure event"
@@ -130,6 +133,7 @@ Defines constraints on the AuditEvent Resource to record when a Privacy Disclosu
 	patient 1..1
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 

diff --git a/input/fsh/IUAgetAccessToken.fsh b/input/fsh/IUAgetAccessToken.fsh
@@ -17,12 +17,14 @@ This AuditEvent is recorded by Authorization Client and/or Authorization Server
   - the access token request
 """
 * type = http://dicom.nema.org/resources/ontology/DCM#110114 // "User Authentication"
+* type 1..
 * subtype 1..1
 * subtype = urn:ihe:event-type-code#ITI-71 // "Get Access Token"
 * action = #E
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #closed
@@ -58,13 +60,15 @@ This AuditEvent is recorded by Authorization Client and/or Authorization Server
     token-response 0..1	
 * entity[token-request].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[token-request].role = http://terminology.hl7.org/CodeSystem/object-role#24 // "Query"
+* entity[token-request].role 1..
 * entity[token-request].what 0..0
 * entity[token-request].query 1..1
 * entity[token-request].query ^short = "contains the http request in raw form, without the code_verifier value"
 
 
 * entity[token-response].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[token-response].role = http://terminology.hl7.org/CodeSystem/object-role#13 // "Security Resource"
+* entity[token-response].role 1..
 * entity[token-response].what 1..1
 * entity[token-response].what ^short = "holds the token id issued" 
 * entity[token-response].detail 1..*

diff --git a/input/fsh/PatientCreate.fsh b/input/fsh/PatientCreate.fsh
@@ -26,6 +26,7 @@ A basic AuditEvent profile for when a RESTful Create action happens successfully
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #open
@@ -63,6 +64,7 @@ A basic AuditEvent profile for when a RESTful Create action happens successfully
 * entity[transaction].what.identifier.value ^short = "the value of X-Request-Id"
 * entity[data].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[data].role from RestObjectRoles (required)
+* entity[data].role 1..
 * entity[data].what 1..1
 * entity[data].securityLabel ^short = "may contain the security labels on the resource returned"
 
@@ -90,6 +92,7 @@ A basic AuditEvent profile for when a RESTful Create action happens successfully
     patient 1..1 
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 

diff --git a/input/fsh/PatientDelete.fsh b/input/fsh/PatientDelete.fsh
@@ -26,6 +26,7 @@ A basic AuditEvent profile for when a RESTful Delete action happens successfully
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #open
@@ -63,6 +64,7 @@ A basic AuditEvent profile for when a RESTful Delete action happens successfully
 * entity[transaction].what.identifier.value ^short = "the value of X-Request-Id"
 * entity[data].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[data].role from RestObjectRoles (required)
+* entity[data].role 1..
 * entity[data].what 1..1
 * entity[data].securityLabel 0..* // may contain the securityLabels on the resource
 * entity[data].securityLabel ^short = "may be replicated from the resource .meta.security"
@@ -91,5 +93,6 @@ A basic AuditEvent profile for when a RESTful Delete action happens successfully
     patient 1..1 
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
diff --git a/input/fsh/PatientQuery.fsh b/input/fsh/PatientQuery.fsh
@@ -38,6 +38,7 @@ Note: the pattern defined in DICOM and IHE have the client is identified as the
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #open
@@ -75,6 +76,7 @@ Note: the pattern defined in DICOM and IHE have the client is identified as the
 * entity[transaction].what.identifier.value ^short = "the value of X-Request-Id"
 * entity[query].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[query].role = http://terminology.hl7.org/CodeSystem/object-role#24 // "Query"
+* entity[query].role 1..
 * entity[query].what 0..0
 * entity[query].lifecycle 0..0 
 * entity[query].securityLabel ^short = "may contain the security labels on the Bundle search set returned"
@@ -114,6 +116,7 @@ Note: the pattern defined in DICOM and IHE have that the client is identified as
     patient 1..1 
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 

diff --git a/input/fsh/PatientRead.fsh b/input/fsh/PatientRead.fsh
@@ -27,6 +27,7 @@ A basic AuditEvent profile for when a RESTful Read action happens successfully.
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #open
@@ -95,6 +96,7 @@ A basic AuditEvent profile for when a RESTful Read action happens successfully,
     patient 1..1
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)
 

diff --git a/input/fsh/PatientUpdate.fsh b/input/fsh/PatientUpdate.fsh
@@ -27,6 +27,7 @@ A basic AuditEvent profile for when a RESTful Update action happens successfully
 * recorded 1..1
 // failures are recorded differently
 * outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 // "Success"
+* outcome 1..
 * agent ^slicing.discriminator.type = #pattern
 * agent ^slicing.discriminator.path = "type"
 * agent ^slicing.rules = #open
@@ -64,6 +65,7 @@ A basic AuditEvent profile for when a RESTful Update action happens successfully
 * entity[transaction].what.identifier.value ^short = "the value of X-Request-Id"
 * entity[data].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#2 // "System Object"
 * entity[data].role from RestObjectRoles (required)
+* entity[data].role 1..
 * entity[data].what 1..1
 * entity[data].securityLabel ^short = "may contain the security labels on the resource returned"
 
@@ -93,6 +95,7 @@ A basic AuditEvent profile for when a RESTful Update action happens successfully
     patient 1..1 
 * entity[patient].type = http://terminology.hl7.org/CodeSystem/audit-entity-type#1 // "Person"
 * entity[patient].role = http://terminology.hl7.org/CodeSystem/object-role#1 // "Patient"
+* entity[patient].role 1..
 * entity[patient].what 1..1
 * entity[patient].what only Reference(Patient)