From fec0a0315ace61d63d05e1bcd71900777a229463 Mon Sep 17 00:00:00 2001 From: Aleksandr Date: Mon, 16 Oct 2017 16:14:17 +0700 Subject: Resolved conflicts on merge with master --- .../scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala') 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, -- cgit v1.2.3