From deba20326e3269fee3ef51f8e6841f17453b4155 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 28 Sep 2017 13:12:32 -0700 Subject: Simplified Export entities for EVLS --- .../scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala | 4 ++-- .../export/patient/ExportPatientLabelEvidenceDocument.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala index 6114661..184782b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientLabel.scala @@ -13,8 +13,8 @@ final case class RawPatientLabel(patientId: UuidId[Patient], disease: String, documentId: LongId[Document], requestId: RecordRequestId, - documentType: String, - providerType: String, + documentType: DocumentType, + providerType: ProviderType, startDate: LocalDate, endDate: Option[LocalDate]) diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala index 99912bc..7003615 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala @@ -4,12 +4,12 @@ import java.time.LocalDate import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ -import xyz.driver.pdsuidomain.entities.{Document, RawPatientLabel, RecordRequestId} +import xyz.driver.pdsuidomain.entities._ final case class ExportPatientLabelEvidenceDocument(documentId: LongId[Document], requestId: RecordRequestId, - documentType: String, - providerType: String, + documentType: DocumentType, + providerType: ProviderType, date: LocalDate) object ExportPatientLabelEvidenceDocument extends PhiLogging { -- cgit v1.2.3