From 6d61eaaa1c49e0efdcd9772b5a6b245af4a619db Mon Sep 17 00:00:00 2001
From: saquino0827 <saquino@flexion.us>
Date: Wed, 21 Feb 2024 11:35:58 -0600
Subject: [PATCH 1/5] Update etor md initial results flow edit

---
 ig/input/fsh/logical-oru-01.fsh  | 26 ++++++++++++++++++++++++++
 ig/input/pagecontent/etor-nbs.md |  3 ---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 ig/input/fsh/logical-oru-01.fsh

diff --git a/ig/input/fsh/logical-oru-01.fsh b/ig/input/fsh/logical-oru-01.fsh
new file mode 100644
index 000000000..401b0fdca
--- /dev/null
+++ b/ig/input/fsh/logical-oru-01.fsh
@@ -0,0 +1,26 @@
+// defines the ORU-R01 (loosely) input that is expected for newborn screening
+
+Logical: ORUR01
+Id: oru-R01-logical-model
+Title: "ORU-R01"
+Description: "The expected input for ORU formatted data for the newborn screening ETOR workflow"
+* MSH 1..1 MSHSegment "MSH segment"
+* PID 1..1 PIDSegment "PID segment"
+* ORC 1..* ORCSegment "ORC segment"
+* OBR 1..* OBRSegment "OBR segment"
+* OBX 1..* OBXSegment "OBX segment"
+
+
+// Provenance Section begins
+Instance: oru-R01-logical-model-history-create
+InstanceOf: Provenance
+Title: "Initial creation of ORU-R01 message changelog"
+Usage: #definition
+* target[+] = Reference(StructureDefinition/oru-R01-logical-model)
+* recorded = "2024-02-21T17:36:36.0000Z"
+* occurredDateTime = "2024-02-21"
+* reason = http://terminology.hl7.org/CodeSystem/v3-ActReason#METAMGT
+* reason.text = "Created an ORU resource"
+* activity = http://terminology.hl7.org/CodeSystem/v3-DataOperation#CREATE
+* agent[+].type = http://terminology.hl7.org/CodeSystem/provenance-participant-type#author
+* agent[=].who.display = "T. R. Johnson"
diff --git a/ig/input/pagecontent/etor-nbs.md b/ig/input/pagecontent/etor-nbs.md
index c3faed1de..161eebf3c 100644
--- a/ig/input/pagecontent/etor-nbs.md
+++ b/ig/input/pagecontent/etor-nbs.md
@@ -11,9 +11,6 @@ Orders request flow from a healthcare organization (HCO), such as a hospital or
 The order contains demographic information on the baby and their next-of-kin, the formal request of the newborn screening panel, and any observations required to evaluate the specimen such as birth weight.
 
 #### Results
-
-This workflow is a work in progress.  More details will emerge as the intermediary researches this area.
-
 #### Acknowledgements and Negative Acknowledgements
 
 This workflow is a work in progress.  More details will emerge as the intermediary researches this area.

From 0d184d9382e4fe94ebdfcbe6ec7de4de1bb9ef38 Mon Sep 17 00:00:00 2001
From: saquino0827 <saquino@flexion.us>
Date: Wed, 21 Feb 2024 11:38:00 -0600
Subject: [PATCH 2/5] test fix pre commit issues

---
 ig/input/pagecontent/etor-nbs.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ig/input/pagecontent/etor-nbs.md b/ig/input/pagecontent/etor-nbs.md
index 161eebf3c..f1492522a 100644
--- a/ig/input/pagecontent/etor-nbs.md
+++ b/ig/input/pagecontent/etor-nbs.md
@@ -11,6 +11,9 @@ Orders request flow from a healthcare organization (HCO), such as a hospital or
 The order contains demographic information on the baby and their next-of-kin, the formal request of the newborn screening panel, and any observations required to evaluate the specimen such as birth weight.
 
 #### Results
+
+Results return flow from a public health lab to a healthcare organization (HCO), such as a hospital or birthing center. The result contains the observation request results of newborn screening tests performed for the baby as well as demographic information on the baby and their next-of-kin.
+
 #### Acknowledgements and Negative Acknowledgements
 
 This workflow is a work in progress.  More details will emerge as the intermediary researches this area.

From c1b9def1a50b8c3aa9c9c689f21554b418e73a29 Mon Sep 17 00:00:00 2001
From: saquino0827 <saquino@flexion.us>
Date: Wed, 21 Feb 2024 11:38:35 -0600
Subject: [PATCH 3/5] Line break for etor-nbs.md

---
 ig/input/pagecontent/etor-nbs.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ig/input/pagecontent/etor-nbs.md b/ig/input/pagecontent/etor-nbs.md
index f1492522a..8ef09a9f0 100644
--- a/ig/input/pagecontent/etor-nbs.md
+++ b/ig/input/pagecontent/etor-nbs.md
@@ -12,7 +12,8 @@ The order contains demographic information on the baby and their next-of-kin, th
 
 #### Results
 
-Results return flow from a public health lab to a healthcare organization (HCO), such as a hospital or birthing center. The result contains the observation request results of newborn screening tests performed for the baby as well as demographic information on the baby and their next-of-kin.
+Results return flow from a public health lab to a healthcare organization (HCO), such as a hospital or birthing center.
+The result contains the observation request results of newborn screening tests performed for the baby as well as demographic information on the baby and their next-of-kin.
 
 #### Acknowledgements and Negative Acknowledgements
 

From bbc4fb524e047526207e877abd626b628b79b78e Mon Sep 17 00:00:00 2001
From: saquino0827 <saquino@flexion.us>
Date: Wed, 21 Feb 2024 11:51:10 -0600
Subject: [PATCH 4/5] Add NK1 and SPM to ORU documentation

---
 ig/input/fsh/logical-oru-01.fsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ig/input/fsh/logical-oru-01.fsh b/ig/input/fsh/logical-oru-01.fsh
index 401b0fdca..5c22df17c 100644
--- a/ig/input/fsh/logical-oru-01.fsh
+++ b/ig/input/fsh/logical-oru-01.fsh
@@ -3,11 +3,13 @@
 Logical: ORUR01
 Id: oru-R01-logical-model
 Title: "ORU-R01"
-Description: "The expected input for ORU formatted data for the newborn screening ETOR workflow"
+Description: "The expected input and output for ORU formatted data for the newborn screening ETOR workflow"
 * MSH 1..1 MSHSegment "MSH segment"
 * PID 1..1 PIDSegment "PID segment"
+* NK1 1..1 NK1Segment "NK1 segment"
 * ORC 1..* ORCSegment "ORC segment"
 * OBR 1..* OBRSegment "OBR segment"
+* SPM 1..1 SPMSegment "SPM segment"
 * OBX 1..* OBXSegment "OBX segment"
 
 

From 8535391f869bff2a2526a718bd3fcc646b3a29e2 Mon Sep 17 00:00:00 2001
From: saquino0827 <saquino@flexion.us>
Date: Thu, 22 Feb 2024 10:42:33 -0600
Subject: [PATCH 5/5] NK1 update and SPM update

---
 ig/input/fsh/logical-oru-01.fsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ig/input/fsh/logical-oru-01.fsh b/ig/input/fsh/logical-oru-01.fsh
index 5c22df17c..487da1829 100644
--- a/ig/input/fsh/logical-oru-01.fsh
+++ b/ig/input/fsh/logical-oru-01.fsh
@@ -6,10 +6,10 @@ Title: "ORU-R01"
 Description: "The expected input and output for ORU formatted data for the newborn screening ETOR workflow"
 * MSH 1..1 MSHSegment "MSH segment"
 * PID 1..1 PIDSegment "PID segment"
-* NK1 1..1 NK1Segment "NK1 segment"
+* NK1 0..* NK1Segment "NK1 segment"
 * ORC 1..* ORCSegment "ORC segment"
 * OBR 1..* OBRSegment "OBR segment"
-* SPM 1..1 SPMSegment "SPM segment"
+* SPM 0..1 SPMSegment "SPM segment"
 * OBX 1..* OBXSegment "OBX segment"
 
 
@@ -25,4 +25,4 @@ Usage: #definition
 * reason.text = "Created an ORU resource"
 * activity = http://terminology.hl7.org/CodeSystem/v3-DataOperation#CREATE
 * agent[+].type = http://terminology.hl7.org/CodeSystem/provenance-participant-type#author
-* agent[=].who.display = "T. R. Johnson"
+* agent[=].who.display = "S. Aquino"