diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-11-14 15:45:50 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-11-14 15:45:50 +0700 |
| commit | add98e1a1100d5b0fb666ac4669d0a90272959ca (patch) | |
| tree | 4e32e92e7bc3a6373f95f04bd28f946b5b100234 /src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala | |
| parent | 2afec69b277c031eb52e1a05e57ff7bb0079f8d1 (diff) | |
| parent | 29ee5de759374ceed9c856a51443a3f7c2cec029 (diff) | |
| download | rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.gz rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.bz2 rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.zip | |
Merge branch 'master' into PDSUI-2345
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala index d944e42..6499318 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala @@ -17,12 +17,12 @@ object patientlabel { case JsObject(fields) => val primaryValue = fields .get("primaryValue") - .map(_.convertTo[Option[LabelValue]]) + .map(_.convertTo[LabelValue]) .getOrElse(orig.primaryValue) val verifiedPrimaryValue = fields .get("verifiedPrimaryValue") - .map(_.convertTo[Option[LabelValue]]) + .map(_.convertTo[LabelValue]) .getOrElse(orig.verifiedPrimaryValue) orig.copy( |