diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-11 14:40:19 +0600 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-11 14:41:30 +0600 |
| commit | bfac6a54dcf37e0280cc8f2ec6ff3802dc8e8dfe (patch) | |
| tree | 2d66348851ad61b43cc0cb114aa56537cedad926 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala | |
| parent | 9e60edb6216fce615b13f9bcc68d8f86258b85c3 (diff) | |
| download | rest-query-bfac6a54dcf37e0280cc8f2ec6ff3802dc8e8dfe.tar.gz rest-query-bfac6a54dcf37e0280cc8f2ec6ff3802dc8e8dfe.tar.bz2 rest-query-bfac6a54dcf37e0280cc8f2ec6ff3802dc8e8dfe.zip | |
PDSUI-2188 Created and fixed test for json formats for ReP and TM
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 | 20 |
1 files changed, 9 insertions, 11 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 e29b9fd..3b52833 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 @@ -10,17 +10,15 @@ object patientlabel { def applyUpdateToPatientLabel(json: JsValue, orig: PatientLabel): PatientLabel = json match { case JsObject(fields) => - val primaryValue = if (fields.contains("primaryValue")) { - fields - .get("primaryValue") - .map(_.convertTo[FuzzyValue]) - } else orig.primaryValue + val primaryValue = fields + .get("primaryValue") + .map(_.convertTo[Option[FuzzyValue]]) + .getOrElse(orig.primaryValue) - val verifiedPrimaryValue = if (fields.contains("verifiedPrimaryValue")) { - fields - .get("verifiedPrimaryValue") - .map(_.convertTo[FuzzyValue]) - } else orig.verifiedPrimaryValue + val verifiedPrimaryValue = fields + .get("verifiedPrimaryValue") + .map(_.convertTo[Option[FuzzyValue]]) + .getOrElse(orig.verifiedPrimaryValue) orig.copy( primaryValue = primaryValue, @@ -56,7 +54,7 @@ object patientlabel { "evidenceText" -> evidence.evidenceText.toJson, "documentId" -> evidence.documentId.toJson, "evidenceId" -> evidence.evidenceId.toJson, - "reportId" -> evidence.isImplicitMatch.toJson, + "reportId" -> evidence.reportId.toJson, "documentType" -> evidence.documentType.toJson, "date" -> evidence.date.toJson, "providerType" -> evidence.providerType.toJson |