From 7d8712a62d30b412717e1b730c0ad267cd207aa4 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Mon, 9 Oct 2017 12:24:59 -0700
Subject: Getting rid of the FuzzyValues, Name as a string, and condition

---
 .../export/patient/ExportPatientLabelEvidence.scala   | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidence.scala')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidence.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidence.scala
index fb40339..6472a6b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidence.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidence.scala
@@ -1,11 +1,12 @@
 package xyz.driver.pdsuidomain.entities.export.patient
 
+import xyz.driver.entities.labels.LabelValue
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuidomain.entities.{ExtractedData, RawPatientLabel}
+import xyz.driver.pdsuidomain.entities.ExtractedData
 
 final case class ExportPatientLabelEvidence(id: LongId[ExtractedData],
-                                            value: FuzzyValue,
+                                            value: LabelValue,
                                             evidenceText: String,
                                             document: ExportPatientLabelEvidenceDocument)
 
@@ -13,20 +14,8 @@ object ExportPatientLabelEvidence {
 
   implicit def toPhiString(x: ExportPatientLabelEvidence): PhiString = {
     import x._
-    phi"ExportPatientLabelEvidence(id=${Unsafe(id)}, value=$value, " +
+    phi"ExportPatientLabelEvidence(id=${Unsafe(id)}, value=${Unsafe(value)}, " +
       phi"evidenceText=${Unsafe(evidenceText)}, document=$document)"
   }
 
-  def fromRaw(x: RawPatientLabel) = ExportPatientLabelEvidence(
-    id = x.evidenceId,
-    value = x.value,
-    evidenceText = x.evidenceText,
-    document = ExportPatientLabelEvidenceDocument(
-      x.documentId,
-      x.requestId,
-      x.documentType,
-      x.providerType,
-      x.startDate
-    )
-  )
 }
-- 
cgit v1.2.3