From 7d8712a62d30b412717e1b730c0ad267cd207aa4 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Mon, 9 Oct 2017 12:24:59 -0700
Subject: Getting rid of the FuzzyValues, Name as a string, and condition

---
 .../pdsuidomain/formats/json/sprayformats/patientcriterion.scala   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
index affb346..7e8c220 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
@@ -1,9 +1,10 @@
 package xyz.driver.pdsuidomain.formats.json.sprayformats
 
 import spray.json._
-import xyz.driver.pdsuicommon.domain.FuzzyValue
+import xyz.driver.entities.labels.LabelValue
 import xyz.driver.pdsuidomain.entities._
 import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion}
+import xyz.driver.formats.json.labels._
 
 object patientcriterion {
   import DefaultJsonProtocol._
@@ -14,13 +15,13 @@ object patientcriterion {
       val eligibilityStatus = if (fields.contains("eligibilityStatus")) {
         fields
           .get("eligibilityStatus")
-          .map(_.convertTo[FuzzyValue])
+          .map(_.convertTo[LabelValue])
       } else orig.eligibilityStatus
 
       val verifiedEligibilityStatus = if (fields.contains("verifiedEligibilityStatus")) {
         fields
           .get("verifiedEligibilityStatus")
-          .map(_.convertTo[FuzzyValue])
+          .map(_.convertTo[LabelValue])
       } else orig.verifiedEligibilityStatus
 
       orig.copy(
-- 
cgit v1.2.3