1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
index 4d0e188..f2b4434 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
@@ -15,16 +15,22 @@ import scala.concurrent.Future
 object PatientCriterionService {
 
   final case class DraftPatientCriterion(id: LongId[PatientCriterion],
-                                         eligibilityStatus: Option[LabelValue],
+                                         eligibilityStatus: Option[Option[LabelValue]],
                                          isVerified: Option[Boolean]) {
     def applyTo(orig: PatientCriterion) = {
       orig.copy(
-        eligibilityStatus = eligibilityStatus.orElse(orig.eligibilityStatus),
+        eligibilityStatus = eligibilityStatus.getOrElse(orig.eligibilityStatus),
         isVerified = isVerified.getOrElse(orig.isVerified)
       )
     }
   }
 
+  object DraftPatientCriterion {
+    implicit def toPhiString(x: DraftPatientCriterion): PhiString = {
+      phi"DraftPatientCriterion(id=${x.id}, eligibilityStatus=${Unsafe(x.eligibilityStatus)}, isVerified=${x.isVerified})"
+    }
+  }
+
   trait DefaultPatientNotFoundError {
     def userMessage: String = "Patient not found"
   }