1 files changed, 5 insertions, 22 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala
index 42ac55b..f35c3fd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala
@@ -2,31 +2,14 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDate
 
+import xyz.driver.entities.assays.AssayType
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.domain.UuidId
-import xyz.driver.pdsuicommon.utils.Utils
-import xyz.driver.pdsuidomain.entities.DirectReport.ReportType
 
 object DirectReport {
-
-  sealed trait ReportType extends Product with Serializable {
-    def oneOf(xs: ReportType*): Boolean = xs.contains(this)
-
-    def oneOf(xs: Set[ReportType]): Boolean = xs.contains(this)
-  }
-
-  object ReportType {
-    case object IHC   extends ReportType
-    case object DNA   extends ReportType
-    case object CFDNA extends ReportType
-
-    val All                                            = Set(IHC, DNA, CFDNA)
-    implicit def toPhiString(x: ReportType): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass))
-  }
-
   implicit def toPhiString(x: DirectReport): PhiString = {
     import x._
-    phi"DirectReport(id=$id, patientId=$patientId, reportType=$reportType, date=${Unsafe(date)}, " +
+    phi"DirectReport(id=$id, patientId=$patientId, reportType=${Unsafe(reportType)}, date=${Unsafe(date)}, " +
       phi"documentType=${Unsafe(documentType)}, providerType=${Unsafe(providerType)}, " +
       phi"providerName=${Unsafe(providerName)})"
   }
@@ -34,8 +17,8 @@ object DirectReport {
 
 final case class DirectReport(id: UuidId[DirectReport],
                               patientId: UuidId[Patient],
-                              reportType: ReportType,
+                              reportType: AssayType,
                               date: LocalDate,
-                              documentType: String,
-                              providerType: String,
+                              documentType: DocumentType,
+                              providerType: ProviderType,
                               providerName: String)