Refactor collection_case_dicom_json to use case_number instead of case_id for improved clarity and error handling
This commit is contained in:
+4
-7
@@ -4333,15 +4333,12 @@ def collection_case_dicom_json_review(request, exam_id, case_id):
|
|||||||
|
|
||||||
def collection_case_dicom_json(request, exam_id, case_number, review=False):
|
def collection_case_dicom_json(request, exam_id, case_number, review=False):
|
||||||
# Support either case_number (index) or case_id (case PK)
|
# Support either case_number (index) or case_id (case PK)
|
||||||
|
collection = get_object_or_404(CaseCollection, pk=exam_id)
|
||||||
try:
|
try:
|
||||||
casedetail = CaseDetail.objects.get(case=case_id, collection=exam_id)
|
case_obj = collection.get_case_by_index(int(case_number))
|
||||||
|
casedetail = CaseDetail.objects.get(case=case_obj, collection=collection)
|
||||||
except Exception:
|
except Exception:
|
||||||
collection = get_object_or_404(CaseCollection, pk=exam_id)
|
raise Http404("Case not found in collection")
|
||||||
try:
|
|
||||||
case_obj = collection.get_case_by_index(int(case_id))
|
|
||||||
casedetail = CaseDetail.objects.get(case=case_obj, collection=collection)
|
|
||||||
except Exception:
|
|
||||||
raise Http404("Case not found in collection")
|
|
||||||
|
|
||||||
if review:
|
if review:
|
||||||
priors = casedetail.caseprior_set.exclude(prior_visibility="NO")
|
priors = casedetail.caseprior_set.exclude(prior_visibility="NO")
|
||||||
|
|||||||
Reference in New Issue
Block a user