diff --git a/isic/core/templates/core/lesion_detail.html b/isic/core/templates/core/lesion_detail.html index 7ef84e5e..2c99c983 100644 --- a/isic/core/templates/core/lesion_detail.html +++ b/isic/core/templates/core/lesion_detail.html @@ -126,11 +126,6 @@
Outcome Diagnosis
{{ lesion.outcome_diagnosis|default:"-" }}
- -
-
Outcome Benign/Malignant
-
{{ lesion.outcome_benign_malignant }}
-
diff --git a/isic/ingest/api.py b/isic/ingest/api.py index c891f3c5..fecc756c 100644 --- a/isic/ingest/api.py +++ b/isic/ingest/api.py @@ -32,7 +32,6 @@ class Meta: longitudinally_monitored: bool index_image_id: str | None outcome_diagnosis: str | None - outcome_benign_malignant: str | None @staticmethod def resolve_images(obj: Lesion) -> list[ImageOut]: diff --git a/isic/ingest/models/lesion.py b/isic/ingest/models/lesion.py index a671cccf..cf217bcd 100644 --- a/isic/ingest/models/lesion.py +++ b/isic/ingest/models/lesion.py @@ -75,7 +75,6 @@ class LesionInfo(TypedDict): images_count: int outcome_diagnosis: str - outcome_benign_malignant: str longitudinally_monitored: bool @@ -97,7 +96,6 @@ def with_total_info(self): partition_by=[F("id")], ), outcome_diagnosis=F("fq_diagnosis"), - outcome_benign_malignant=F("accessions__benign_malignant"), ) # this is hard to do without defining a new type of expression because django # wants to perform group by on subqueries. diff --git a/isic/ingest/tests/test_api_lesion.py b/isic/ingest/tests/test_api_lesion.py index ea614f33..04afdf4b 100644 --- a/isic/ingest/tests/test_api_lesion.py +++ b/isic/ingest/tests/test_api_lesion.py @@ -98,7 +98,6 @@ def test_api_lesion_completeness(client, lesion_factory, image_factory): lesion = lesion_factory() image = image_factory( accession__lesion=lesion, - accession__benign_malignant="malignant", accession__fq__diagnosis="melanoma", accession__acquisition_day=1, public=True, @@ -113,7 +112,6 @@ def test_api_lesion_completeness(client, lesion_factory, image_factory): resp.json()["results"][0]["outcome_diagnosis"] == DiagnosisEnum.malignant_malignant_melanocytic_proliferations_melanoma_melanoma_invasive ) - assert resp.json()["results"][0]["outcome_benign_malignant"] == "malignant" # verify longitudinally_monitored image_factory(