diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-16 16:14:17 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-16 16:14:17 +0700 |
| commit | fec0a0315ace61d63d05e1bcd71900777a229463 (patch) | |
| tree | 642409f180b07a1880d915f9fe1e7d567163217d | |
| parent | b6b1065ba2a3617019d52501276139ccae1bf5d1 (diff) | |
| download | rest-query-fec0a0315ace61d63d05e1bcd71900777a229463.tar.gz rest-query-fec0a0315ace61d63d05e1bcd71900777a229463.tar.bz2 rest-query-fec0a0315ace61d63d05e1bcd71900777a229463.zip | |
Resolved conflicts on merge with master
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala index 5d5585a..66b710e 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala @@ -100,7 +100,7 @@ object extracteddata { implicit val extractedDataFormat: RootJsonFormat[RichExtractedData] = new RootJsonFormat[RichExtractedData] { override def write(richData: RichExtractedData): JsValue = JsObject( - "id" -> richData.extractedData.id.id.toJson, + "id" -> richData.extractedData.id.toJson, "documentId" -> richData.extractedData.documentId.toJson, "keywordId" -> richData.extractedData.keywordId.toJson, "evidence" -> richData.extractedData.evidenceText.toJson, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala index e8c0b94..eac5ea7 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala @@ -160,7 +160,7 @@ object record { new RootJsonFormat[MedicalRecord] { override def write(record: MedicalRecord): JsValue = JsObject( - "id" -> record.id.id.toJson, + "id" -> record.id.toJson, "patientId" -> record.patientId.toJson, "caseId" -> record.caseId.toJson, "disease" -> record.disease.toJson, |