diff options
| author | vlad <vlad@driver.xyz> | 2017-06-16 12:35:30 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-06-16 12:35:30 -0700 |
| commit | 6f9e7158e51e082f3fe5ba209cc178416056d24e (patch) | |
| tree | d76d94ad6516897c3aaf9e27e9242e6dee5627a1 | |
| parent | 1f0cb533633fc95df948a2617351335646f3e200 (diff) | |
| download | rest-query-6f9e7158e51e082f3fe5ba209cc178416056d24e.tar.gz rest-query-6f9e7158e51e082f3fe5ba209cc178416056d24e.tar.bz2 rest-query-6f9e7158e51e082f3fe5ba209cc178416056d24e.zip | |
Label evidences with DIRECT reportsv0.1.7
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala | 6 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabel.scala | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala index b5714b6..c09a1d8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DirectReport.scala @@ -16,11 +16,11 @@ object DirectReport { } object ReportType { - case object IHC extends ReportType - case object DNA extends ReportType + case object IHC extends ReportType + case object DNA extends ReportType case object CFDNA extends ReportType - val All = Set(IHC, DNA, CFDNA) + val All = Set(IHC, DNA, CFDNA) implicit def toPhiString(x: ReportType): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabel.scala index cb6f8a0..63d38f8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientLabel.scala @@ -25,7 +25,7 @@ object PatientLabelEvidence { implicit def toPhiString(x: PatientLabelEvidence): PhiString = { import x._ phi"PatientLabelEvidence(id=$id, patientLabelId=$patientLabelId, value=${Unsafe(value)}, " + - phi"documentId=$documentId, evidenceId=$evidenceId)" + phi"documentId=$documentId, evidenceId=$evidenceId, reportId=$reportId)" } } @@ -33,5 +33,6 @@ case class PatientLabelEvidence(id: LongId[PatientLabelEvidence], patientLabelId: LongId[PatientLabel], value: FuzzyValue, evidenceText: String, - documentId: LongId[Document], - evidenceId: LongId[ExtractedData]) + reportId: Option[UuidId[DirectReport]], + documentId: Option[LongId[Document]], + evidenceId: Option[LongId[ExtractedData]]) |