Merge pull request #89 from answerdigital/fix/condition-prodecure-occ…

…urrence add condition and procedure occurrence fixes
answerdigital · Jan 16, 2025 · 4f29280 · 4f29280
2 parents 543d37b + 14a4ac5
commit 4f29280
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 3 deletions.
diff --git a/OmopTransformer/CDS/ConditionOccurrence/CdsConditionOccurrence.cs b/OmopTransformer/CDS/ConditionOccurrence/CdsConditionOccurrence.cs
@@ -22,12 +22,21 @@ internal class CdsConditionOccurrence : OmopConditionOccurrence<CdsConditionOccu
     [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
     public override DateTime? condition_start_date { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_start_datetime { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_datetime { get; set; }
+
     [CopyValue(nameof(Source.RecordConnectionIdentifier))]
     public override string? RecordConnectionIdentifier { get; set; }
 
     [CopyValue(nameof(Source.DiagnosisCode))]
     public override string? condition_source_value { get; set; }
 
-    [ConstantValue(32020, "EHR encounter diagnosis")]
+    [ConstantValue(32818, "EHR administration record")]
     public override int? condition_type_concept_id { get; set; }
 }
diff --git a/OmopTransformer/CDS/ProcedureOccurrence/CdsProcedureOccurrence.cs b/OmopTransformer/CDS/ProcedureOccurrence/CdsProcedureOccurrence.cs
@@ -18,6 +18,12 @@ internal class CdsProcedureOccurrence : OmopProcedureOccurrence<CdsProcedureOccu
     [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
     public override DateTime? procedure_datetime { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
+    public override DateTime? procedure_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
+    public override DateTime? procedure_end_datetime { get; set; }
+
     [ConstantValue(32818, "`EHR Administration record`")]
     public override int? procedure_type_concept_id { get; set; }
 

diff --git a/OmopTransformer/SUS/APC/ConditionOccurrence/SusAPCConditionOccurrence.cs b/OmopTransformer/SUS/APC/ConditionOccurrence/SusAPCConditionOccurrence.cs
@@ -18,10 +18,19 @@ internal class SusAPCConditionOccurrence : OmopConditionOccurrence<SusAPCConditi
     [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
     public override DateTime? condition_start_date { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_start_datetime { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_datetime { get; set; }
+
     [CopyValue(nameof(Source.DiagnosisICD))]
     public override string? condition_source_value { get; set; }
 
-    [ConstantValue(32020, "EHR encounter diagnosis")]
+    [ConstantValue(32818, "EHR administration record")]
     public override int? condition_type_concept_id { get; set; }
 
     [CopyValue(nameof(Source.GeneratedRecordIdentifier))]

diff --git a/OmopTransformer/SUS/APC/ProcedureOccurrence/SusAPCProcedureOccurrence.cs b/OmopTransformer/SUS/APC/ProcedureOccurrence/SusAPCProcedureOccurrence.cs
@@ -18,6 +18,12 @@ internal class SusAPCProcedureOccurrence : OmopProcedureOccurrence<SusAPCProcedu
     [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
     public override DateTime? procedure_datetime { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
+    public override DateTime? procedure_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.PrimaryProcedureDate))]
+    public override DateTime? procedure_end_datetime { get; set; }
+
     [ConstantValue(32818, "`EHR Administration record`")]
     public override int? procedure_type_concept_id { get; set; }
 

diff --git a/OmopTransformer/SUS/OP/ConditionOccurrence/SusOPConditionOccurrence.cs b/OmopTransformer/SUS/OP/ConditionOccurrence/SusOPConditionOccurrence.cs
@@ -18,9 +18,18 @@ internal class SusOPConditionOccurrence : OmopConditionOccurrence<SusOPCondition
     [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
     public override DateTime? condition_start_date { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_start_datetime { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.CDSActivityDate))]
+    public override DateTime? condition_end_datetime { get; set; }
+
     [CopyValue(nameof(Source.DiagnosisICD))]
     public override string? condition_source_value { get; set; }
 
-    [ConstantValue(32020, "EHR encounter diagnosis")]
+    [ConstantValue(32818, "EHR administration record")]
     public override int? condition_type_concept_id { get; set; }
 }
diff --git a/OmopTransformer/SUS/OP/ProcedureOccurrence/SusOPProcedureOccurrence.cs b/OmopTransformer/SUS/OP/ProcedureOccurrence/SusOPProcedureOccurrence.cs
@@ -18,6 +18,12 @@ internal class SusOPProcedureOccurrence : OmopProcedureOccurrence<SusOPProcedure
     [Transform(typeof(DateConverter), nameof(Source.AppointmentDate))]
     public override DateTime? procedure_datetime { get; set; }
 
+    [Transform(typeof(DateConverter), nameof(Source.AppointmentDate))]
+    public override DateTime? procedure_end_date { get; set; }
+
+    [Transform(typeof(DateConverter), nameof(Source.AppointmentDate))]
+    public override DateTime? procedure_end_datetime { get; set; }
+
     [ConstantValue(32818, "`EHR Administration record`")]
     public override int? procedure_type_concept_id { get; set; }