Merge pull request #55 from drivergroup/PDSUI-2330

PDSUI-2330 Add support for inclusion/exclusion criteria to the TM backend

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
index 79a19ed..7027eef 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
@@ -9,11 +9,11 @@ import xyz.driver.pdsuicommon.logging._
 object PatientCriterion {
   implicit def toPhiString(x: PatientCriterion): PhiString = {
     import x._
-    phi"PatientCriterion(id=$id, patientLabelId=$patientLabelId, trialId=${Unsafe(trialId)}, nctId=${Unsafe(nctId)}, " +
+    phi"PatientCriterion(id=$id, patientLabelId=$patientLabelId, trialId=${Unsafe(trialId)}, nctId=$nctId, " +
       phi"criterionId=$criterionId, criterionValue=${Unsafe(criterionValue)}, " +
       phi"isImplicitMatch=$criterionIsDefining), criterionIsDefining=${Unsafe(criterionIsDefining)}, " +
       phi"eligibilityStatus=${Unsafe(eligibilityStatus)}, verifiedEligibilityStatus=${Unsafe(verifiedEligibilityStatus)}, " +
-      phi"isVerified=${Unsafe(isVerified)}, lastUpdate=${Unsafe(lastUpdate)}"
+      phi"isVerified=${Unsafe(isVerified)}, lastUpdate=${Unsafe(lastUpdate)}, inclusion=${Unsafe(inclusion)}"
   }
 
   /**
@@ -52,7 +52,8 @@ final case class PatientCriterion(id: LongId[PatientCriterion],
                                   verifiedEligibilityStatus: Option[LabelValue],
                                   isVerified: Boolean,
                                   isVisible: Boolean,
-                                  lastUpdate: LocalDateTime) {
+                                  lastUpdate: LocalDateTime,
+                                  inclusion: Option[Boolean]) {
   def isIneligibleForEv: Boolean = eligibilityStatus.contains(LabelValue.No) && isVerified
 }