diff options
author | vlad <vlad@driver.xyz> | 2017-07-05 20:26:35 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-07-05 20:26:35 -0700 |
commit | 94bc5cbb482c8499e4d19bc149c65b1c0da0af97 (patch) | |
tree | 8b6f7bc7359c767cad8ae030196b028e3531fcba /src/main/scala/xyz/driver/pdsuidomain/entities | |
parent | 08312a9288c983c15dd380f0037c30db5d6c05a7 (diff) | |
download | rest-query-94bc5cbb482c8499e4d19bc149c65b1c0da0af97.tar.gz rest-query-94bc5cbb482c8499e4d19bc149c65b1c0da0af97.tar.bz2 rest-query-94bc5cbb482c8499e4d19bc149c65b1c0da0af97.zip |
Label names are not used by EVLS anymore (PDS-1225)
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala | 4 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala index e7956a8..6114661 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala @@ -7,7 +7,6 @@ import xyz.driver.pdsuicommon.logging._ final case class RawPatientLabel(patientId: UuidId[Patient], labelId: LongId[Label], - label: String, value: FuzzyValue, evidenceId: LongId[ExtractedData], evidenceText: String, @@ -23,8 +22,7 @@ object RawPatientLabel { implicit def toPhiString(x: RawPatientLabel): PhiString = { import x._ - phi"RawPatientLabel(patientId=$patientId, labelId=$labelId, label=${Unsafe(label)}, value=$value," + - phi"evidenceId=${Unsafe(evidenceId)}, " + + phi"RawPatientLabel(patientId=$patientId, labelId=$labelId, value=$value, evidenceId=${Unsafe(evidenceId)}, " + phi"evidenceText=${Unsafe(evidenceText)}, documentId=$documentId, requestId=${Unsafe(requestId)}, " + phi"documentType=${Unsafe(documentType)}, providerType=${Unsafe(providerType)}, " + phi"startDate=$startDate, endDate=$endDate)" diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala index 5135c21..c69fc09 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala @@ -4,7 +4,7 @@ import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities.{Label, RawPatientLabel} -final case class ExportPatientLabel(id: LongId[Label], name: String, evidences: List[ExportPatientLabelEvidence]) +final case class ExportPatientLabel(id: LongId[Label], evidences: List[ExportPatientLabelEvidence]) object ExportPatientLabel extends PhiLogging { @@ -14,15 +14,6 @@ object ExportPatientLabel extends PhiLogging { } def fromRaw(labelId: LongId[Label], rawPatientLabels: List[RawPatientLabel]): ExportPatientLabel = { - val firstLabel = rawPatientLabels.headOption - if (firstLabel.isEmpty) { - logger.warn(phi"rawPatientLabels is empty, labelId: $labelId") - } - - ExportPatientLabel( - id = labelId, - name = firstLabel.map(_.label).getOrElse(""), - evidences = rawPatientLabels.map(ExportPatientLabelEvidence.fromRaw) - ) + ExportPatientLabel(id = labelId, evidences = rawPatientLabels.map(ExportPatientLabelEvidence.fromRaw)) } } |