aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-10-10 16:41:33 +0700
committerAleksandr <ognelisar@gmail.com>2017-10-10 16:41:33 +0700
commit4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch)
tree4f77275d4460a184cf64085e9d7597841a50fbc9 /src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
parentc32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff)
parent4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff)
downloadrest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz
rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2
rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
index 6be0b88..598b11e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
@@ -2,6 +2,8 @@ package xyz.driver.pdsuidomain.entities
import java.time.{LocalDate, LocalDateTime}
+import xyz.driver.entities.common.FullName
+import xyz.driver.entities.patient.CancerType
import xyz.driver.pdsuicommon.domain._
import xyz.driver.pdsuicommon.logging._
import xyz.driver.pdsuicommon.utils.Utils
@@ -52,14 +54,14 @@ object Patient {
final case class Patient(id: UuidId[Patient],
status: Patient.Status,
- name: String,
+ name: FullName[Patient],
dob: LocalDate,
assignee: Option[StringId[User]],
previousStatus: Option[Patient.Status],
previousAssignee: Option[StringId[User]],
lastActiveUserId: Option[StringId[User]],
isUpdateRequired: Boolean,
- condition: String,
+ disease: CancerType,
orderId: PatientOrderId,
lastUpdate: LocalDateTime) {