Search in sources :

Example 1 with BiopsyTreatmentData

use of com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData in project hmftools by hartwigmedical.

the class PatientReader method read.

@NotNull
public Patient read(@NotNull final EcrfPatient ecrfPatient, @NotNull final List<SampleData> sequencedSamples) throws IOException {
    LOGGER.info("Reading patient " + ecrfPatient.patientId() + " with samples: " + sequencedSamples);
    final BaselineData baselineData = cpctPatientReader.read(ecrfPatient);
    final PreTreatmentData preTreatmentData = preTreatmentReader.read(ecrfPatient);
    final List<BiopsyData> clinicalBiopsies = BiopsyReader.read(ecrfPatient);
    final List<BiopsyTreatmentData> treatments = biopsyTreatmentReader.read(ecrfPatient);
    final List<BiopsyTreatmentResponseData> treatmentResponses = BiopsyTreatmentResponseReader.read(ecrfPatient);
    final List<TumorMarkerData> tumorMarkers = TumorMarkerReader.read(ecrfPatient);
    final MatchResult<BiopsyData> matchedBiopsies = BiopsyMatcher.matchBiopsiesToTumorSamples(ecrfPatient.patientId(), sequencedSamples, clinicalBiopsies);
    final MatchResult<BiopsyTreatmentData> matchedTreatments = TreatmentMatcher.matchTreatmentsToBiopsies(ecrfPatient.patientId(), clinicalBiopsies, treatments);
    final MatchResult<BiopsyTreatmentResponseData> matchedResponses = TreatmentResponseMatcher.matchTreatmentResponsesToTreatments(ecrfPatient.patientId(), treatments, treatmentResponses);
    final List<ValidationFinding> findings = Lists.newArrayList();
    findings.addAll(matchedBiopsies.findings());
    findings.addAll(matchedTreatments.findings());
    findings.addAll(matchedResponses.findings());
    return new Patient(ecrfPatient.patientId(), baselineData, preTreatmentData, sequencedSamples, matchedBiopsies.values(), matchedTreatments.values(), matchedResponses.values(), tumorMarkers, findings);
}
Also used : Patient(com.hartwig.hmftools.patientdb.data.Patient) EcrfPatient(com.hartwig.hmftools.common.ecrf.datamodel.EcrfPatient) BaselineData(com.hartwig.hmftools.patientdb.data.BaselineData) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) BiopsyTreatmentResponseData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentResponseData) ValidationFinding(com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding) TumorMarkerData(com.hartwig.hmftools.patientdb.data.TumorMarkerData) BiopsyData(com.hartwig.hmftools.patientdb.data.BiopsyData) PreTreatmentData(com.hartwig.hmftools.patientdb.data.PreTreatmentData) NotNull(org.jetbrains.annotations.NotNull)

Example 2 with BiopsyTreatmentData

use of com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData in project hmftools by hartwigmedical.

the class PatientValidator method validateTreatmentResponses.

@NotNull
@VisibleForTesting
static List<ValidationFinding> validateTreatmentResponses(@NotNull final String patientIdentifier, @NotNull final List<BiopsyTreatmentData> treatments, @NotNull final List<BiopsyTreatmentResponseData> responses) {
    final List<ValidationFinding> findings = Lists.newArrayList();
    for (int i = 0; i < responses.size(); i++) {
        findings.addAll(validateTreatmentResponse(patientIdentifier, responses.get(i), i == 0));
    }
    Collections.sort(treatments);
    Collections.sort(responses);
    if (treatments.isEmpty() && !responses.isEmpty()) {
        findings.add(ValidationFinding.of(ECRF_LEVEL, patientIdentifier, FORM_TREATMENT, "treatment response filled in, but treatment data missing", FormStatusState.UNKNOWN, false));
    }
    if (!treatments.isEmpty() && !responses.isEmpty()) {
        final LocalDate firstResponseDate = responses.get(0).date();
        final LocalDate firstTreatmentStart = treatments.get(0).startDate();
        if (firstResponseDate != null && firstTreatmentStart != null && firstResponseDate.isAfter(firstTreatmentStart)) {
            findings.add(ValidationFinding.of(ECRF_LEVEL, patientIdentifier, fields(FORM_TREATMENT, FORM_TUMOR_MEASUREMENT), "first (baseline) measurement date is after first treatment start", FormStatusState.best(treatments.get(0).formStatus(), responses.get(0).formStatus()), treatments.get(0).formLocked() || responses.get(0).formLocked(), "first treatment response: " + firstResponseDate + "; first treatment start: " + firstTreatmentStart));
        }
    }
    final List<BiopsyTreatmentData> treatmentsMissingResponse = treatments.stream().filter(treatment -> shouldHaveResponse(treatment) && !hasResponse(treatment.id(), responses)).collect(Collectors.toList());
    if (treatmentsMissingResponse.size() > 0) {
        findings.add(ValidationFinding.of(ECRF_LEVEL, patientIdentifier, FORM_TUMOR_MEASUREMENT, "no treatment response for at least 1 treatment", FormStatusState.UNKNOWN, false, "treatments " + treatmentsMissingResponse.stream().map(BiopsyTreatmentData::toString).collect(Collectors.toList()) + " should have response since they lasted more than " + Config.IMMEDIATE_TREATMENT_END_THRESHOLD + " days and started more than " + Config.START_DATE_RESPONSE_THRESHOLD + " days ago"));
    }
    return findings;
}
Also used : Comparator.naturalOrder(java.util.Comparator.naturalOrder) FIELD_DEATH_DATE(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_DEATH_DATE) FORM_TUMOR_MEASUREMENT(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentResponseReader.FORM_TUMOR_MEASUREMENT) FORM_BIOPS(com.hartwig.hmftools.patientdb.readers.BiopsyReader.FORM_BIOPS) FIELD_BIOPSY_DATE(com.hartwig.hmftools.patientdb.readers.BiopsyReader.FIELD_BIOPSY_DATE) TreatmentData(com.hartwig.hmftools.patientdb.data.TreatmentData) Comparator.nullsLast(java.util.Comparator.nullsLast) Duration(java.time.Duration) FIELD_PRE_DRUG(com.hartwig.hmftools.patientdb.readers.PreTreatmentReader.FIELD_PRE_DRUG) FIELD_PRETREATMENT_GIVEN(com.hartwig.hmftools.patientdb.readers.PreTreatmentReader.FIELD_PRETREATMENT_GIVEN) FIELD_PRIMARY_TUMOR_LOCATION_OTHER(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_PRIMARY_TUMOR_LOCATION_OTHER) Patient(com.hartwig.hmftools.patientdb.data.Patient) BiopsyData(com.hartwig.hmftools.patientdb.data.BiopsyData) Collectors(java.util.stream.Collectors) FIELD_RESPONSE_DATE(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentResponseReader.FIELD_RESPONSE_DATE) FIELD_DRUG(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_DRUG) ValidationFinding(com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding) List(java.util.List) FIELD_PRIMARY_TUMOR_LOCATION(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_PRIMARY_TUMOR_LOCATION) FORM_TREATMENT(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FORM_TREATMENT) LocalDate(java.time.LocalDate) FIELD_RESPONSE(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentResponseReader.FIELD_RESPONSE) Strings(org.apache.logging.log4j.util.Strings) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) NotNull(org.jetbrains.annotations.NotNull) BiopsyTreatmentResponseData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentResponseData) FIELD_DRUG_START(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_DRUG_START) FIELD_ASSESSMENT_DATE(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentResponseReader.FIELD_ASSESSMENT_DATE) FIELD_BIRTH_YEAR3(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_BIRTH_YEAR3) FIELD_BIRTH_YEAR2(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_BIRTH_YEAR2) Config(com.hartwig.hmftools.patientdb.Config) FIELD_TREATMENT_GIVEN(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_TREATMENT_GIVEN) FIELD_PRERADIOTHERAPY_GIVEN(com.hartwig.hmftools.patientdb.readers.PreTreatmentReader.FIELD_PRERADIOTHERAPY_GIVEN) FIELD_MEASUREMENT_DONE(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentResponseReader.FIELD_MEASUREMENT_DONE) PreTreatmentData(com.hartwig.hmftools.patientdb.data.PreTreatmentData) FIELD_SITE_OTHER(com.hartwig.hmftools.patientdb.readers.BiopsyReader.FIELD_SITE_OTHER) FIELD_HOSPITAL2(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_HOSPITAL2) FIELD_INFORMED_CONSENT_DATE(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_INFORMED_CONSENT_DATE) FIELD_HOSPITAL1(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_HOSPITAL1) Lists(com.google.common.collect.Lists) Comparator.comparing(java.util.Comparator.comparing) BaselineData(com.hartwig.hmftools.patientdb.data.BaselineData) FIELD_BIRTH_YEAR1(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_BIRTH_YEAR1) FIELD_SITE(com.hartwig.hmftools.patientdb.readers.BiopsyReader.FIELD_SITE) DrugData(com.hartwig.hmftools.patientdb.data.DrugData) FIELD_LOCATION(com.hartwig.hmftools.patientdb.readers.BiopsyReader.FIELD_LOCATION) FIELD_REGISTRATION_DATE2(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_REGISTRATION_DATE2) FIELD_REGISTRATION_DATE1(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_REGISTRATION_DATE1) FIELD_RADIOTHERAPY_GIVEN(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_RADIOTHERAPY_GIVEN) FIELD_SEX(com.hartwig.hmftools.patientdb.readers.CpctPatientReader.FIELD_SEX) FIELD_DRUG_END(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_DRUG_END) FormStatusState(com.hartwig.hmftools.common.ecrf.formstatus.FormStatusState) CuratedTreatment(com.hartwig.hmftools.patientdb.data.CuratedTreatment) VisibleForTesting(com.google.common.annotations.VisibleForTesting) Collections(java.util.Collections) FIELD_DRUG_OTHER(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FIELD_DRUG_OTHER) ValidationFinding(com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) LocalDate(java.time.LocalDate) VisibleForTesting(com.google.common.annotations.VisibleForTesting) NotNull(org.jetbrains.annotations.NotNull)

Example 3 with BiopsyTreatmentData

use of com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData in project hmftools by hartwigmedical.

the class PatientReaderTest method canReadCpctPatientTreatments.

@Test
public void canReadCpctPatientTreatments() throws IOException {
    final CpctEcrfModel model = loadTestEcrf();
    assertEquals(1, model.patientCount());
    final EcrfPatient cpctPatient = model.patients().iterator().next();
    final List<BiopsyTreatmentData> treatments = new BiopsyTreatmentReader(createTreatmentCurator()).read(cpctPatient);
    assertEquals(1, treatments.size());
    assertEquals(1, treatments.get(0).drugs().size());
    final LocalDate startDate = LocalDate.parse("2012-02-18", DATE_FORMATTER);
    final LocalDate endDate = LocalDate.parse("2012-04-02", DATE_FORMATTER);
    assertEquals("Bevacizumab", treatments.get(0).drugs().get(0).name());
    assertEquals(startDate, treatments.get(0).drugs().get(0).startDate());
    assertEquals(endDate, treatments.get(0).drugs().get(0).endDate());
    assertEquals(startDate, treatments.get(0).startDate());
    assertEquals(endDate, treatments.get(0).endDate());
    assertEquals("Bevacizumab", treatments.get(0).treatmentName());
    assertEquals("Yes", treatments.get(0).treatmentGiven());
}
Also used : EcrfPatient(com.hartwig.hmftools.common.ecrf.datamodel.EcrfPatient) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) LocalDate(java.time.LocalDate) CpctEcrfModel(com.hartwig.hmftools.common.ecrf.CpctEcrfModel) Test(org.junit.Test)

Example 4 with BiopsyTreatmentData

use of com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData in project hmftools by hartwigmedical.

the class TreatmentMatcher method matchTreatmentsToBiopsies.

@NotNull
public static MatchResult<BiopsyTreatmentData> matchTreatmentsToBiopsies(@NotNull final String patientId, @NotNull final List<BiopsyData> biopsies, @NotNull final List<BiopsyTreatmentData> treatments) {
    final List<BiopsyTreatmentData> matchedTreatments = Lists.newArrayList();
    final List<ValidationFinding> findings = Lists.newArrayList();
    List<BiopsyData> remainingBiopsies = biopsies;
    for (final BiopsyTreatmentData treatment : treatments) {
        final String treatmentGiven = treatment.treatmentGiven();
        if (treatmentGiven == null || treatmentGiven.toLowerCase().equals("no")) {
            matchedTreatments.add(treatment);
            continue;
        }
        final Map<Boolean, List<BiopsyData>> partitions = remainingBiopsies.stream().collect(Collectors.partitioningBy(clinicalBiopsy -> isPossibleMatch(clinicalBiopsy.date(), treatment.startDate())));
        final List<BiopsyData> possibleMatches = partitions.get(true);
        if (possibleMatches.size() == 0) {
            findings.add(treatmentMatchFinding(patientId, "no biopsy match for treatment", treatment.toString()));
            matchedTreatments.add(treatment);
        } else if (possibleMatches.size() > 1) {
            findings.add(treatmentMatchFinding(patientId, "multiple biopsy matches for treatment", treatment + ". biopsies:  " + possibleMatches.stream().map(BiopsyData::toString).collect(Collectors.toList())));
            matchedTreatments.add(treatment);
        } else if (possibleMatches.get(0).date() == null) {
            findings.add(treatmentMatchFinding(patientId, "treatment matched biopsy with null date.", treatment.toString()));
            matchedTreatments.add(treatment);
        } else {
            final BiopsyData clinicalBiopsy = possibleMatches.get(0);
            matchedTreatments.add(ImmutableBiopsyTreatmentData.builder().from(treatment).biopsyId(clinicalBiopsy.id()).build());
            remainingBiopsies = partitions.get(false);
        }
    }
    return new MatchResult<>(matchedTreatments, findings);
}
Also used : ImmutableBiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.ImmutableBiopsyTreatmentData) Config(com.hartwig.hmftools.patientdb.Config) BiopsyData(com.hartwig.hmftools.patientdb.data.BiopsyData) Collectors(java.util.stream.Collectors) ValidationFinding(com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding) FormStatusState(com.hartwig.hmftools.common.ecrf.formstatus.FormStatusState) Nullable(org.jetbrains.annotations.Nullable) List(java.util.List) Lists(com.google.common.collect.Lists) FORM_TREATMENT(com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FORM_TREATMENT) Duration(java.time.Duration) LocalDate(java.time.LocalDate) Map(java.util.Map) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) NotNull(org.jetbrains.annotations.NotNull) ValidationFinding(com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding) List(java.util.List) BiopsyData(com.hartwig.hmftools.patientdb.data.BiopsyData) ImmutableBiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.ImmutableBiopsyTreatmentData) BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) NotNull(org.jetbrains.annotations.NotNull)

Example 5 with BiopsyTreatmentData

use of com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData in project hmftools by hartwigmedical.

the class TreatmentResponseMatcher method hasOverlappingTreatments.

private static boolean hasOverlappingTreatments(@NotNull List<BiopsyTreatmentData> sortedTreatments) {
    Iterator<BiopsyTreatmentData> iterator = sortedTreatments.iterator();
    BiopsyTreatmentData current = iterator.hasNext() ? iterator.next() : null;
    while (iterator.hasNext()) {
        assert current != null;
        BiopsyTreatmentData next = iterator.next();
        LocalDate currentEndDate = current.endDate();
        LocalDate nextStartDate = next.startDate();
        assert nextStartDate != null;
        if (currentEndDate == null || currentEndDate.isAfter(nextStartDate)) {
            return true;
        }
        current = next;
    }
    return false;
}
Also used : BiopsyTreatmentData(com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData) LocalDate(java.time.LocalDate)

Aggregations

BiopsyTreatmentData (com.hartwig.hmftools.patientdb.data.BiopsyTreatmentData)9 LocalDate (java.time.LocalDate)7 NotNull (org.jetbrains.annotations.NotNull)7 ValidationFinding (com.hartwig.hmftools.common.ecrf.datamodel.ValidationFinding)6 BiopsyData (com.hartwig.hmftools.patientdb.data.BiopsyData)4 BiopsyTreatmentResponseData (com.hartwig.hmftools.patientdb.data.BiopsyTreatmentResponseData)4 VisibleForTesting (com.google.common.annotations.VisibleForTesting)3 Lists (com.google.common.collect.Lists)3 FormStatusState (com.hartwig.hmftools.common.ecrf.formstatus.FormStatusState)3 Config (com.hartwig.hmftools.patientdb.Config)3 BaselineData (com.hartwig.hmftools.patientdb.data.BaselineData)3 DrugData (com.hartwig.hmftools.patientdb.data.DrugData)3 Patient (com.hartwig.hmftools.patientdb.data.Patient)3 PreTreatmentData (com.hartwig.hmftools.patientdb.data.PreTreatmentData)3 FORM_TREATMENT (com.hartwig.hmftools.patientdb.readers.BiopsyTreatmentReader.FORM_TREATMENT)3 EcrfPatient (com.hartwig.hmftools.common.ecrf.datamodel.EcrfPatient)2 CuratedTreatment (com.hartwig.hmftools.patientdb.data.CuratedTreatment)2 ImmutableBiopsyTreatmentData (com.hartwig.hmftools.patientdb.data.ImmutableBiopsyTreatmentData)2 TreatmentData (com.hartwig.hmftools.patientdb.data.TreatmentData)2 FIELD_BIOPSY_DATE (com.hartwig.hmftools.patientdb.readers.BiopsyReader.FIELD_BIOPSY_DATE)2