diff options
| author | vlad <vlad@driver.xyz> | 2017-10-09 12:24:59 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-10-09 12:24:59 -0700 |
| commit | 7d8712a62d30b412717e1b730c0ad267cd207aa4 (patch) | |
| tree | 76662e1b233943c1c840a658682aac9766aa64d7 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala | |
| parent | 52b5e1a5febc91aa316565fdea309df2b646481e (diff) | |
| download | rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.tar.gz rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.tar.bz2 rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.zip | |
Getting rid of the FuzzyValues, Name as a string, and condition
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala index b36949e..ff6d24d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.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.PatientLabelService.RichPatientLabel +import xyz.driver.formats.json.labels._ object patientlabel { import DefaultJsonProtocol._ @@ -13,12 +14,12 @@ object patientlabel { case JsObject(fields) => val primaryValue = fields .get("primaryValue") - .map(_.convertTo[Option[FuzzyValue]]) + .map(_.convertTo[Option[LabelValue]]) .getOrElse(orig.primaryValue) val verifiedPrimaryValue = fields .get("verifiedPrimaryValue") - .map(_.convertTo[Option[FuzzyValue]]) + .map(_.convertTo[Option[LabelValue]]) .getOrElse(orig.verifiedPrimaryValue) orig.copy( |