fix merge conflicts with master

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) {