From ceb1c13b7d9b8f1021783f56406a48dbe78aff9a Mon Sep 17 00:00:00 2001
From: Christopher Hex <che@christopherh.dev>
Date: Tue, 22 Aug 2023 10:55:55 +0200
Subject: [PATCH 1/2] Changes to FibriCheck monitoring profile

---
 input/fsh/profiles.fsh    | 38 ++++++++------------------------------
 input/fsh/terminology.fsh |  2 +-
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/input/fsh/profiles.fsh b/input/fsh/profiles.fsh
index f9f9793c..7d28dd44 100644
--- a/input/fsh/profiles.fsh
+++ b/input/fsh/profiles.fsh
@@ -12,9 +12,13 @@ Parent: PatientMonitoringObservation
 * component ^slicing.rules = #open
 * component ^slicing.description = "Observation components"
 
-* component contains hrIndicator 0..1 and hrReviewFinding 0..1 and rmssd 0..1 and symptoms 0..* and activityStatus 0..1 and chadvasc 0..1 and measurementAttempts 0..1
+* component contains hrValue 0..1 and hrIndicator 0..1 and hrReviewFinding 0..1 and symptoms 0..* and activityStatus 0..1 and hrReport 0..1
 // note that one of these may be upgraded to be the main observation value
 
+* component[hrValue]
+  * value[x] only Quantity
+  * code = #fibricheck-hr-value
+
 * component[hrIndicator]
   * value[x] only CodeableConcept
   * valueCodeableConcept from FCHRIndicatorVS
@@ -25,10 +29,6 @@ Parent: PatientMonitoringObservation
   * valueCodeableConcept from FCHRFindingVS
   * code = #fibricheck-hr-review-finding
 
-* component[rmssd]
-  * value[x] only Quantity
-  * code = #fibricheck-rmssd
-
 * component[symptoms]
   * value[x] only CodeableConcept
   * valueCodeableConcept from FCContextSymptomsVS
@@ -39,17 +39,9 @@ Parent: PatientMonitoringObservation
   * valueCodeableConcept from FCContextActivityVS
   * code = #fibricheck-activity-status
 
-* component[chadvasc]
-  * value[x] only CodeableConcept
-  * code = #fibricheck-chadvasc
-//  * valueCodeableConcept from 
-
-* component[measurementAttempts]
-  * value[x] only integer
-  * code = #fibricheck-measurement-attempts
-
-
-* device only Reference(SWDevice)
+* component[hrReport]
+  * value[x] only url
+  * code = #fibricheck-report
 
 * code = #fibricheck
 * effective[x] only dateTime 
@@ -86,17 +78,3 @@ Parent: MonitoringPatient
 // * identifier[fibricheck-username]
 //   * type = #username
 //   * system = "http://somesystem/identifiertypes/username"
-
-
-Profile: SWDevice
-Parent: Device
-
-
-* version ^slicing.discriminator.type = #pattern
-* version ^slicing.discriminator.path = "type"
-* version ^slicing.rules = #open
-* version ^slicing.description = "Types of versions"
-* version contains software-version 1..1
-
-* version[software-version].type = urn:iso:std:iso:11073:10101#531975
-* version[software-version].value MS
diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh
index 41c6ac4a..c03480a0 100644
--- a/input/fsh/terminology.fsh
+++ b/input/fsh/terminology.fsh
@@ -7,7 +7,7 @@ Description:  "FCHRIndicator"
 * ^experimental = false
 * ^caseSensitive = true
 * #normal "Normal"
-* #warning "warning"
+* #warning "Warning"
 * #urgent "Urgent"
 * #quality "Quality"
 

From 2a0d1867f3c4b188824c37c9c1a38db1eaafdf9c Mon Sep 17 00:00:00 2001
From: Christopher Hex <che@christopherh.dev>
Date: Tue, 22 Aug 2023 11:19:34 +0200
Subject: [PATCH 2/2] Add Measurement Identifier

---
 input/fsh/profiles.fsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/input/fsh/profiles.fsh b/input/fsh/profiles.fsh
index 7d28dd44..f6cc68d0 100644
--- a/input/fsh/profiles.fsh
+++ b/input/fsh/profiles.fsh
@@ -7,6 +7,8 @@ Parent: PatientMonitoringObservation
 * subject 1..1 
 * subject only Reference(HRMonitoringPatient)
 
+* identifier 1..1 Identifier "Unique measurement identifier"
+
 * component ^slicing.discriminator.type = #pattern
 * component ^slicing.discriminator.path = "code"
 * component ^slicing.rules = #open