fix: dose is solved and had values logic

Author: Casper Bollen

src/Informedica.GenOrder.Lib/Order.fs

@@ -2350,30 +2350,46 @@ module Order =
             reraise()
 
 
-    let checkOrderDose pred cmp (ord: Order) : bool =
+    let checkOrderDose pred op (ord: Order) : bool =
+        let checkRte rte = rte |> Rate.toOrdVar |> pred
+        let checkQty qty = qty |> Quantity.toOrdVar |> pred
+
+        let rates =
+            [
+                ord.Orderable.Dose.Rate
+                yield!
+                    ord.Orderable.Components
+                    |> List.map _.Dose
+                    |> List.map _.Rate
+            ]
+
+        let qtys =
+            [
+                ord.Orderable.Dose.Quantity
+                yield!
+                    ord.Orderable.Components
+                    |> List.map _.Dose
+                    |> List.map _.Quantity
+
+            ]
+
+        let isOr = true |> op <| false
+
         match ord.Prescription with
         | Continuous ->
-            ord.Orderable.Dose.Rate |> Rate.toOrdVar |> pred
+            if isOr then rates |> List.exists checkRte
+            else rates |> List.forall checkRte
+        | Timed (freq, _)
         | Discontinuous freq ->
             (freq |> Frequency.toOrdVar |> pred)
-            |> cmp <|
-            (ord.Orderable.Dose.Quantity |> Quantity.toOrdVar |> pred)
-            |> cmp <|
-            (ord.Orderable.Dose.PerTime |> PerTime.toOrdVar |> pred)
+            |> op <|
+            (if isOr then qtys |> List.exists checkQty else qtys |> List.forall checkQty)
         | Once ->
-            (ord.Orderable.Dose.Quantity |> Quantity.toOrdVar |> pred)
-        | Timed (freq, tme) ->
-            (freq |> Frequency.toOrdVar |> pred)
-            |> cmp <|
-            (tme |> Time.toOrdVar |> pred)
-            |> cmp <|
-            (ord.Orderable.Dose.Quantity |> Quantity.toOrdVar |> pred)
-            |> cmp <|
-            (ord.Orderable.Dose.PerTime |> PerTime.toOrdVar |> pred)
+            qtys |> List.forall checkQty
         | OnceTimed tme ->
             (tme |> Time.toOrdVar |> pred)
-            |> cmp <|
-            (ord.Orderable.Dose.Quantity |> Quantity.toOrdVar |> pred)
+            |> op <|
+            (if isOr then qtys |> List.exists checkQty else qtys |> List.forall checkQty)
 
 
     let doseIsSolved = checkOrderDose OrderVariable.isSolved (&&)

src/Informedica.GenOrder.Lib/Scripts/Scenarios.fsx

@@ -98,10 +98,10 @@ let checkCtx msg ctx =
 Patient.infant
 |> Patient.setWeight (10m |> Kilogram |> Some)
 |> PrescriptionContext.create
-|> PrescriptionContext.setFilterIndication "Chronische pijn"
-|> PrescriptionContext.setFilterGeneric "paracetamol"
-|> PrescriptionContext.setFilterShape "drank"
-|> PrescriptionContext.setFilterRoute "oraal"
+|> PrescriptionContext.setFilterIndication "Ernstige infectie, gram negatieve microorganismen"
+|> PrescriptionContext.setFilterGeneric "gentamicine"
+|> PrescriptionContext.setFilterShape "injectievloeistof"
+|> PrescriptionContext.setFilterRoute "intraveneus"
 |> checkCtx "inital setup"
 |> Api.evaluate
 |> checkCtx "first evaluation" //|> ignore
@@ -117,8 +117,8 @@ Patient.infant
                         Order =
                             let dto = s.Order |> Order.Dto.toDto
                             dto.Prescription.Frequency.Variable.ValsOpt.Value.Value <-
-                                dto.Prescription.Frequency.Variable.ValsOpt.Value.Value[0]
-                                |> Array.singleton
+                                dto.Prescription.Frequency.Variable.ValsOpt.Value.Value
+                                |> Array.take 1
 
                             dto |> Order.Dto.fromDto
                     }
@@ -138,10 +138,16 @@ Patient.infant
                     { s with
                         Order =
                             let dto = s.Order |> Order.Dto.toDto
-                            dto.Orderable.Dose.Quantity.Variable.ValsOpt.Value.Value <-
-                                dto.Orderable.Dose.Quantity.Variable.ValsOpt.Value.Value[0]
-                                |> Array.singleton
-
+                            dto.Orderable.Components <-
+                                dto.Orderable.Components
+                                |> List.mapi (fun i cmp ->
+                                    if i > 0 then cmp
+                                    else
+                                        cmp.Dose.Quantity.Variable.ValsOpt.Value.Value <-
+                                            cmp.Dose.Quantity.Variable.ValsOpt.Value.Value
+                                            |> Array.take 1
+                                        cmp
+                                )
                             dto |> Order.Dto.fromDto
                     }
                 )