From b331892f87846945f69a28e9f3ee786cd4b93577 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Nov 2017 16:22:11 -0700 Subject: Using common request contexts and user objects --- src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala index 591b8bd..4794c00 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala @@ -5,6 +5,9 @@ import java.time.LocalDateTime import com.fasterxml.jackson.annotation.JsonSubTypes.Type import com.fasterxml.jackson.annotation.{JsonProperty, JsonSubTypes, JsonTypeInfo} +import xyz.driver.core.auth.User +import xyz.driver.entities.assays.PatientCase +import xyz.driver.entities.clinic.ClinicalRecord import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils @@ -151,9 +154,9 @@ final case class MedicalRecord(id: LongId[MedicalRecord], previousAssignee: Option[StringId[User]], lastActiveUserId: Option[StringId[User]], patientId: UuidId[Patient], - requestId: RecordRequestId, + requestId: xyz.driver.core.Id[ClinicalRecord], disease: String, - caseId: Option[CaseId], + caseId: Option[xyz.driver.core.Id[PatientCase]], physician: Option[String], meta: Option[TextJson[List[Meta]]], lastUpdate: LocalDateTime, -- cgit v1.2.3