diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-26 09:58:24 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-26 09:58:24 +0700 |
commit | 49e1fd60cd562f33fbad7d4dd2ceaa535b4434d1 (patch) | |
tree | c8aeae6023ad3476e3d23272249812a0019691c6 /src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial | |
parent | bb4176645aed22311b372f8f7f4897f9012322bd (diff) | |
parent | a0fe954d3680541de1ff8e0e7a5d762352e90072 (diff) | |
download | rest-query-49e1fd60cd562f33fbad7d4dd2ceaa535b4434d1.tar.gz rest-query-49e1fd60cd562f33fbad7d4dd2ceaa535b4434d1.tar.bz2 rest-query-49e1fd60cd562f33fbad7d4dd2ceaa535b4434d1.zip |
Merge pull request #55 from drivergroup/PDSUI-2330
PDSUI-2330 Add support for inclusion/exclusion criteria to the TM backend
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala index b9bf772..5e44413 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala @@ -22,7 +22,8 @@ final case class ApiPatientCriterion(id: Long, verifiedEligibilityStatus: Option[String], isVerified: Boolean, isVisible: Boolean, - lastUpdate: ZonedDateTime) + lastUpdate: ZonedDateTime, + inclusion: Option[Boolean]) object ApiPatientCriterion { @@ -49,7 +50,8 @@ object ApiPatientCriterion { }), Writes.of[String])) and (JsPath \ "isVerified").format[Boolean] and (JsPath \ "isVisible").format[Boolean] and - (JsPath \ "lastUpdate").format[ZonedDateTime] + (JsPath \ "lastUpdate").format[ZonedDateTime] and + (JsPath \ "inclusion").formatNullable[Boolean] ) (ApiPatientCriterion.apply, unlift(ApiPatientCriterion.unapply)) def fromDomain(patientCriterion: PatientCriterion, @@ -70,6 +72,7 @@ object ApiPatientCriterion { verifiedEligibilityStatus = patientCriterion.verifiedEligibilityStatus.map(_.toString), isVerified = patientCriterion.isVerified, isVisible = patientCriterion.isVisible, - lastUpdate = ZonedDateTime.of(patientCriterion.lastUpdate, ZoneId.of("Z")) + lastUpdate = ZonedDateTime.of(patientCriterion.lastUpdate, ZoneId.of("Z")), + inclusion = patientCriterion.inclusion ) } |