chore: sync commit working on checker

halcwb · Nov 30, 2023 · 508d8f1 · 508d8f1
1 parent 4518c17
commit 508d8f1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/Informedica.GenForm.Lib/Filter.fs b/src/Informedica.GenForm.Lib/Filter.fs
@@ -18,7 +18,7 @@ module Filter =
             WeightInGram = None
             HeightInCm = None
             GestAgeInDays = None
-            PMAge = None
+            PMAgeInDays = None
             DoseType = AnyDoseType
             Location = AnyAccess
         }
@@ -43,7 +43,7 @@ module Filter =
             WeightInGram = pat.WeightInGram
             HeightInCm = pat.HeightInCm
             GestAgeInDays = pat.GestAgeInDays
-            PMAge = pat.PMAgeInDays
+            PMAgeInDays = pat.PMAgeInDays
             Location = pat.VenousAccess
         }
 
@@ -62,14 +62,14 @@ module Filter =
             WeightInGram = filter.WeightInGram
             HeightInCm = filter.HeightInCm
             GestAgeInDays = filter.GestAgeInDays
-            PMAgeInDays = filter.PMAge
+            PMAgeInDays = filter.PMAgeInDays
             VenousAccess = filter.Location
         }
 
 
     let calcPMAge (filter : Filter) =
         { filter with
-            PMAge =
+            PMAgeInDays =
                 filter
                 |> getPatient
                 |> Patient.calcPMAge

diff --git a/src/Informedica.GenForm.Lib/Patient.fs b/src/Informedica.GenForm.Lib/Patient.fs
@@ -110,7 +110,7 @@ module PatientCategory =
                         |> MinMax.isBetween p.GestAge
                     fun (p: PatientCategory) ->
                         // defaults to normal postmenstrual age
-                        filter.PMAge
+                        filter.PMAgeInDays
                         |> Option.defaultValue 259N
                         |> Some
                         |> MinMax.isBetween p.PMAge

diff --git a/src/Informedica.GenForm.Lib/Types.fs b/src/Informedica.GenForm.Lib/Types.fs
@@ -385,7 +385,7 @@ module Types =
             /// The Gestational Age in days to filter on
             GestAgeInDays : BigRational option
             /// The Post Menstrual Age in days to filter on
-            PMAge : BigRational option
+            PMAgeInDays : BigRational option
             /// The DoseType to filter on
             DoseType : DoseType
             /// The Venous Access Location to filter on

diff --git a/src/Informedica.GenOrder.Lib/Api.fs b/src/Informedica.GenOrder.Lib/Api.fs
@@ -459,7 +459,7 @@ module Api =
                     Department = Some d
                     AgeInDays = sc.Patient.AgeInDays
                     GestAgeInDays = sc.Patient.GestAgeInDays
-                    PMAge = sc.Patient.PMAgeInDays
+                    PMAgeInDays = sc.Patient.PMAgeInDays
                     WeightInGram = Some w
                     HeightInCm = Some h
                     Indication = ind

diff --git a/src/Informedica.ZForm.Lib/Types.fs b/src/Informedica.ZForm.Lib/Types.fs
@@ -50,8 +50,6 @@ module Types =
     and Gender = Male | Female | Undetermined
 
 
-
-
     /// Dose range limits
     type DoseRange =
         {
@@ -147,8 +145,11 @@ module Types =
     /// The frequencies of a TotalDosage
     and Frequency =
         {
+            /// The list of possible frequencies
             Frequencies : Frequencies
+            /// The TimeUnit to use for the frequencies
             TimeUnit : TimeUnit
+            /// The minimal interval between frequencies
             MinimalInterval : ValueUnit Option
         }
         static member Frequencies_ :