Fix a mege conflict

Author: james-cockayne

OmopTransformer/SACT/Observation/SactAdjunctiveTherapyType/SactAdjunctiveTherapyType.cs

@@ -12,8 +12,8 @@ internal class SactAdjunctiveTherapyType : OmopObservation<SactAdjunctiveTherapy
     [ConstantValue(4194400, "Treatment intent")]
     public override int[]? observation_concept_id { get; set; }
 
-    [Transform(typeof(DateConverter), nameof(Source.Administration_Date))]
-    public override DateTime? observation_date { get; set; }
+    [Transform(typeof(DateOnlyConverter), nameof(Source.Administration_Date))]
+    public override DateOnly? observation_date { get; set; }
 
     [Transform(typeof(DateAndTimeCombiner), nameof(Source.Administration_Date), nameof(Source.Administration_Date))]
     public override DateTime? observation_datetime { get; set; }

OmopTransformer/SACT/Observation/SactAdministrationRoute/SactAdministrationRoute.cs

@@ -12,8 +12,8 @@ internal class SactAdministrationRoute : OmopObservation<SactAdministrationRoute
     [ConstantValue(4106215, "Route of administration value")]
     public override int[]? observation_concept_id { get; set; }
 
-    [Transform(typeof(DateConverter), nameof(Source.Administration_Date))]
-    public override DateTime? observation_date { get; set; }
+    [Transform(typeof(DateOnlyConverter), nameof(Source.Administration_Date))]
+    public override DateOnly? observation_date { get; set; }
 
     [Transform(typeof(DateAndTimeCombiner), nameof(Source.Administration_Date), nameof(Source.Administration_Date))]
     public override DateTime? observation_datetime { get; set; }

OmopTransformer/SACT/Observation/SactClinicalTrial/SactClinicalTrial.cs

@@ -12,8 +12,8 @@ internal class SactClinicalTrial : OmopObservation<SactClinicalTrialRecord>
     [ConstantValue(4002165, "Clinical trial")]
     public override int[]? observation_concept_id { get; set; }
 
-    [Transform(typeof(DateConverter), nameof(Source.Administration_Date))]
-    public override DateTime? observation_date { get; set; }
+    [Transform(typeof(DateOnlyConverter), nameof(Source.Administration_Date))]
+    public override DateOnly? observation_date { get; set; }
 
     [Transform(typeof(DateAndTimeCombiner), nameof(Source.Administration_Date), nameof(Source.Administration_Date))]
     public override DateTime? observation_datetime { get; set; }

OmopTransformer/SACT/Observation/SactTreatmentIntent/SactTreatmentIntent.cs

@@ -12,8 +12,8 @@ internal class SactTreatmentIntent : OmopObservation<SactTreatmentIntentRecord>
     [ConstantValue(4194400, "Treatment intent")]
     public override int[]? observation_concept_id { get; set; }
 
-    [Transform(typeof(DateConverter), nameof(Source.Administration_Date))]
-    public override DateTime? observation_date { get; set; }
+    [Transform(typeof(DateOnlyConverter), nameof(Source.Administration_Date))]
+    public override DateOnly? observation_date { get; set; }
 
     [Transform(typeof(DateAndTimeCombiner), nameof(Source.Administration_Date), nameof(Source.Administration_Date))]
     public override DateTime? observation_datetime { get; set; }