fix merge conflictsv0.7.5

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabelEvidenceView.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabelEvidenceView.scala
index 3311d96..6055921 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabelEvidenceView.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabelEvidenceView.scala
@@ -2,28 +2,28 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDate
 
-import xyz.driver.entities.labels.Label
+import xyz.driver.entities.labels.{Label, LabelValue}
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 
 object PatientLabelEvidenceView {
   implicit def toPhiString(x: PatientLabelEvidenceView): PhiString = {
     import x._
-    phi"PatientLabelEvidenceView(id=$id, value=$value, documentId=$documentId, " +
+    phi"PatientLabelEvidenceView(id=$id, value=${Unsafe(value)}, documentId=$documentId, " +
       phi"evidenceId=$evidenceId, reportId=$reportId, patientId=$patientId, labelId=$labelId, " +
       phi"isImplicitMatch=$isImplicitMatch)"
   }
 }
 
 final case class PatientLabelEvidenceView(id: LongId[PatientLabelEvidence],
-                                          value: FuzzyValue,
+                                          value: LabelValue,
                                           evidenceText: String,
                                           documentId: Option[LongId[Document]],
                                           evidenceId: Option[LongId[ExtractedData]],
                                           reportId: Option[UuidId[DirectReport]],
-                                          documentType: String,
+                                          documentType: DocumentType,
                                           date: Option[LocalDate], // Document.startDate is optional
-                                          providerType: String,
+                                          providerType: ProviderType,
                                           patientId: UuidId[Patient],
                                           labelId: LongId[Label],
                                           isImplicitMatch: Boolean)