diff options
| author | vlad <vlad@driver.xyz> | 2017-10-09 12:49:02 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-10-09 12:49:02 -0700 |
| commit | eeeb6d90f1c6882f0b3d765022b114d97e4dba40 (patch) | |
| tree | 7fd813bcba7a3e44f5694bfbf0618ea93d64b5f8 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats | |
| parent | 7d8712a62d30b412717e1b730c0ad267cd207aa4 (diff) | |
| download | rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.tar.gz rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.tar.bz2 rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.zip | |
Getting rid of the FuzzyValues, Name as a string, and conditionv0.7.1
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala index 3da76c1..2b0dfe5 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala @@ -40,7 +40,7 @@ object patient { "previousAssignee" -> patient.previousAssignee.toJson, "lastActiveUser" -> patient.lastActiveUserId.toJson, "lastUpdate" -> patient.lastUpdate.toJson, - "condition" -> patient.cancerType.toJson, + "disease" -> patient.disease.toJson, "orderId" -> patient.orderId.toJson ) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala index 8000a27..d851c2c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala @@ -6,6 +6,7 @@ import spray.json._ import xyz.driver.core.json.EnumJsonFormat import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuidomain.entities._ +import xyz.driver.formats.json.patient._ object trial { import DefaultJsonProtocol._ @@ -24,12 +25,6 @@ object trial { "Archived" -> Status.Archived ) - implicit val conditionFormat = new EnumJsonFormat[Condition]( - "Breast" -> Condition.Breast, - "Lung" -> Condition.Lung, - "Prostate" -> Condition.Prostate - ) - implicit val trialWriter: RootJsonWriter[Trial] = new RootJsonWriter[Trial] { override def write(obj: Trial) = JsObject( @@ -41,7 +36,7 @@ object trial { "previousStatus" -> obj.previousStatus.toJson, "previousAssignee" -> obj.previousAssignee.toJson, "lastActiveUser" -> obj.lastActiveUserId.toJson, - "condition" -> obj.condition.toJson, + "disease" -> obj.disease.toJson, "phase" -> obj.phase.toJson, "hypothesisId" -> obj.hypothesisId.toJson, "studyDesignId" -> obj.studyDesignId.toJson, |