From c1cfe096f186d80cd4eed0770e3e284b341cce29 Mon Sep 17 00:00:00 2001
From: Evanette Burrows <evanette.burrows@gmail.com>
Date: Wed, 16 Oct 2024 15:54:29 -0400
Subject: [PATCH 1/3] Update JMDC_Observation.md

---
 docs/JMDC/JMDC_Observation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/JMDC/JMDC_Observation.md b/docs/JMDC/JMDC_Observation.md
index 458503bf..5b38c988 100644
--- a/docs/JMDC/JMDC_Observation.md
+++ b/docs/JMDC/JMDC_Observation.md
@@ -50,7 +50,7 @@ The **annual_health_checkup** table is a wide table with one row per date and ma
 |     person_id    |     member_id    |     Remove 'M' prefix    |          |
 |     observation_type_concept_id    |          |          Coming from the **annual_health_checkup** table set to 32836 (EHR physical examination)         |
 |     observation_date    |     date_of_health_checkup    |          |          |
-|     observation_concept_id    |    smoking_habit<br>mastication<br>sleep      |          |  See the mapping file [here]([Vocab Updates/Annual_Health_Checkup_Mapping.xlsx](https://github.com/OHDSI/ETL-LambdaBuilder/blob/master/docs/JMDC/Vocab%20Updates/Annual_Health_Checkup_Mapping.xlsx)) for how to map these columns to standard concepts        |
+|     observation_concept_id    |    smoking_habit<br>mastication<br>sleep<br>ecg      |          |  See the mapping file [here]([Vocab Updates/Annual_Health_Checkup_Mapping.xlsx](https://github.com/OHDSI/ETL-LambdaBuilder/blob/master/docs/JMDC/Vocab%20Updates/Annual_Health_Checkup_Mapping.xlsx)) for how to map these columns to standard concepts        |
 |     observation_source_concept_id    |          |       Set to 0     |
 |     observation_source_value    |          |          |          |
 |     provider_id    |          |          |          |

From bf642b3fb9d72fd8eb81f0dd1793e1622dd750fb Mon Sep 17 00:00:00 2001
From: Evanette Burrows <evanette.burrows@gmail.com>
Date: Wed, 16 Oct 2024 15:56:17 -0400
Subject: [PATCH 2/3] Update JMDC_Observation.md

---
 docs/JMDC/JMDC_Observation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/JMDC/JMDC_Observation.md b/docs/JMDC/JMDC_Observation.md
index 5b38c988..a9d43fbb 100644
--- a/docs/JMDC/JMDC_Observation.md
+++ b/docs/JMDC/JMDC_Observation.md
@@ -66,6 +66,8 @@ The **annual_health_checkup** table is a wide table with one row per date and ma
 
 ## Change Log
 
+### October 16, 2024
+- Added ecg mappings
 ### April 6, 2022
 - Added more text around how to handle records from the annual_health_checkup table.
 ### July 30, 2023

From 382550a19f08a82007fd2c8e333215f53be68eea Mon Sep 17 00:00:00 2001
From: Anton Ivanov <antoha.ivanov@gmail.com>
Date: Thu, 17 Oct 2024 12:02:39 +0300
Subject: [PATCH 3/3] Update Annual_health_checkups.xml

---
 .../JMDC/Definitions/Annual_health_checkups.xml          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/JMDC/Definitions/Annual_health_checkups.xml b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/JMDC/Definitions/Annual_health_checkups.xml
index eac81a88..9b3a2d08 100644
--- a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/JMDC/Definitions/Annual_health_checkups.xml
+++ b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/JMDC/Definitions/Annual_health_checkups.xml
@@ -892,10 +892,8 @@
 				</Concept>
 			</Concepts>
 		</ObservationDefinition>
-	</Observation>
 
-	<ConditionOccurrence>
-		<ConditionOccurrenceDefinition>
+		<ObservationDefinition>
 			<Condition>{Condition} = 1</Condition>
 			<PersonId>PERSON_ID</PersonId>
 			<IsUnique>true</IsUnique>
@@ -907,7 +905,6 @@
 					</Fields>
 				</Concept>
 			</Concepts>
-		</ConditionOccurrenceDefinition>
-	</ConditionOccurrence>
-
+		</ObservationDefinition>
+	</Observation>
 </QueryDefinition>
\ No newline at end of file