- {% if grouped_series %}
+ {% if grouped_patients %}
+ {% for patient in grouped_patients %}
+
+
+
+
+ Patient ID:{{ patient.patient_id }}
+
+
+
+
+
+
+
+ {% for study_uid, study in patient.studies %}
+
+
+ {{ study.description|default:"(no description)" }}
+ ({{ study_uid }}) — {{ study.series|length }} series
+
+
+
+
+
+ {% if study.partial_imported_uids %}
+
+
+ Partial import detected:
+ {{ study.partial_imported_count }} series in this study already exist.
+ The highlighted rows can finish importing the remaining images.
+ {% if study.matched_existing_series %}
+
+ Existing series in Atlas:
+ {% for existing_series in study.matched_existing_series %}
+ {{ existing_series }}{% if not forloop.last %}, {% endif %}
+ {% endfor %}
+
+ {% endif %}
+
+
+
+ {% endif %}
+ {% if study.import_suggestions %}
+
+ Study already imported:
+ {% for suggestion in study.import_suggestions %}
+
+ {% for series, n, tags, date in study.series %}
+ {% if series in study.partial_imported_uids %}
+ {% if case %}
+ {% include 'atlas/partials/_series_item.html' with show_tags_link=True series_is_partial=True series_item_classes='series-item--partial-import' import_case_id=case.pk %}
+ {% else %}
+ {% include 'atlas/partials/_series_item.html' with show_tags_link=True series_is_partial=True series_item_classes='series-item--partial-import' import_case_id=study.preferred_case_id %}
+ {% endif %}
+ {% else %}
+ {% if case %}
+ {% include 'atlas/partials/_series_item.html' with show_tags_link=True series_is_partial=False series_item_classes='' import_case_id=case.pk %}
+ {% else %}
+ {% include 'atlas/partials/_series_item.html' with show_tags_link=True series_is_partial=False series_item_classes='' %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+ {% endfor %}
+
+ {% endfor %}
+ {% elif grouped_series %}
{% for study_uid, study in grouped_series %}
@@ -233,7 +323,7 @@
-
+
@@ -531,7 +621,7 @@
});
}
- // Select / Deselect all series within a study block
+ // Select / Deselect all series within a study block or patient block
document.addEventListener('click', function (e) {
const target = e.target;
if (target.matches('.select-all-btn')) {
@@ -562,6 +652,34 @@
});
if (typeof updateSelectionCount === 'function') updateSelectionCount();
}
+ if (target.matches('.select-all-patient-btn')) {
+ const patientBlock = target.closest('.patient-block');
+ if (!patientBlock) return;
+ const inputs = patientBlock.querySelectorAll('input[name="selection"]');
+ inputs.forEach(cb => {
+ if (!cb.disabled) {
+ cb.checked = true;
+ const li = cb.closest('.series-item');
+ if (li) li.classList.add('selected');
+ cb.dispatchEvent(new Event('change', { bubbles: true }));
+ }
+ });
+ if (typeof updateSelectionCount === 'function') updateSelectionCount();
+ }
+ if (target.matches('.deselect-all-patient-btn')) {
+ const patientBlock = target.closest('.patient-block');
+ if (!patientBlock) return;
+ const inputs = patientBlock.querySelectorAll('input[name="selection"]');
+ inputs.forEach(cb => {
+ if (!cb.disabled) {
+ cb.checked = false;
+ const li = cb.closest('.series-item');
+ if (li) li.classList.remove('selected');
+ cb.dispatchEvent(new Event('change', { bubbles: true }));
+ }
+ });
+ if (typeof updateSelectionCount === 'function') updateSelectionCount();
+ }
});
// Listen for `case:selected` events dispatched by the case-search widget and perform the import
@@ -884,6 +1002,10 @@
color: #ffffff;
}
+ .select2-container {
+ width: 100% !important;
+ }
+
#series-list li {
}
#series-list .selected {
diff --git a/atlas/tests/test_user_uploads.py b/atlas/tests/test_user_uploads.py
index 79736fd3..7521660e 100644
--- a/atlas/tests/test_user_uploads.py
+++ b/atlas/tests/test_user_uploads.py
@@ -55,4 +55,44 @@ def test_user_uploads_partial_import_button_prefers_case_for_hash_matched_series
assert response.status_code == 200
content = response.content.decode("utf-8")
assert 'class="btn btn-sm btn-warning import-partial-series-btn"' in content
- assert f'data-case-id="{primary_case.pk}"' in content
\ No newline at end of file
+ assert f'data-case-id="{primary_case.pk}"' in content
+
+
+@pytest.mark.django_db
+def test_user_uploads_patient_grouping_and_select2(client, admin_user):
+ client.force_login(admin_user)
+
+ # Create UncategorisedDicom with PatientID tag using bulk_create to avoid reading non-existent file
+ UncategorisedDicom.objects.bulk_create(
+ [
+ UncategorisedDicom(
+ image="pending-upload-patient.dcm",
+ user=admin_user,
+ series_instance_uid="uploaded-series-patient-1",
+ basic_dicom_tags={
+ "SeriesInstanceUID": "uploaded-series-patient-1",
+ "StudyInstanceUID": "study-patient-1",
+ "StudyDescription": "Patient Study 1",
+ "SeriesDescription": "Uploaded series",
+ "Modality": "CT",
+ "PatientID": "PAT-999-XYZ",
+ },
+ )
+ ]
+ )
+
+ response = client.get(reverse("atlas:user_uploads"))
+ assert response.status_code == 200
+ content = response.content.decode("utf-8")
+
+ # Verify patient grouping is rendered
+ assert "PAT-999-XYZ" in content
+ assert "Patient ID:" in content
+ assert "select-all-patient-btn" in content
+
+ # Verify form autocomplete widgets are in context
+ form = response.context["case_series_form"]
+ from dal import autocomplete
+ assert isinstance(form.fields["condition"].widget, autocomplete.ModelSelect2Multiple)
+ assert isinstance(form.fields["presentation"].widget, autocomplete.ModelSelect2Multiple)
+ assert isinstance(form.fields["procedures"].widget, autocomplete.ModelSelect2Multiple)
\ No newline at end of file
diff --git a/atlas/views.py b/atlas/views.py
index 520b1b69..efbcf3b1 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -3343,9 +3343,15 @@ def user_uploads(
for d in dicoms:
tags = d.basic_dicom_tags
+ if tags is None or "PatientID" not in tags:
+ try:
+ d.save()
+ tags = d.basic_dicom_tags
+ except Exception:
+ pass
+
if tags is None:
- d.save()
- tags = d.basic_dicom_tags
+ continue
series_uid = tags.get("SeriesInstanceUID")
if not series_uid:
@@ -3569,6 +3575,36 @@ def user_uploads(
)
study_data["preferred_case_id"] = sorted_suggestions[0]["case"].pk
+ # Now group the processed studies by PatientID
+ patient_groups = defaultdict(lambda: {
+ "studies": [],
+ "min_date": "99999999",
+ })
+
+ for study_uid, study_data in grouped_series:
+ patient_id = "Unknown Patient"
+ if study_data["series"]:
+ first_series_tags = study_data["series"][0][2]
+ patient_id = first_series_tags.get("PatientID") or "Unknown Patient"
+
+ pg = patient_groups[patient_id]
+ pg["studies"].append((study_uid, study_data))
+ study_date = study_data.get("date") or ""
+ if study_date and study_date < pg["min_date"]:
+ pg["min_date"] = study_date
+
+ grouped_patients = sorted(
+ [
+ {
+ "patient_id": patient_id,
+ "studies": pg["studies"],
+ "min_date": pg["min_date"],
+ }
+ for patient_id, pg in patient_groups.items()
+ ],
+ key=lambda x: x["min_date"] or ""
+ )
+
case = False
if case_id is not None:
case = get_object_or_404(Case, pk=case_id)
@@ -3576,17 +3612,6 @@ def user_uploads(
case_series_form = CaseForm(user=request.user)
case_series_form.fields["previous_case"].required = False
case_series_form.fields["previous_case"].widget = HiddenInput()
- for field_name in ("condition", "presentation", "procedures"):
- field = case_series_form.fields.get(field_name)
- if field is None:
- continue
- field.widget = forms.SelectMultiple(
- attrs={
- "class": "form-select",
- "size": 8,
- }
- )
- field.widget.choices = field.choices
return render(
request,
@@ -3594,6 +3619,7 @@ def user_uploads(
{
"series_list": series_list,
"grouped_series": grouped_series,
+ "grouped_patients": grouped_patients,
"uploaded_series_uids": uploaded_series_uids,
"case": case,
"user": user,