diff --git a/rapids/models.py b/rapids/models.py index bd79aea6..6f0643a5 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -429,13 +429,23 @@ class Rapid(models.Model): def get_suggested_answers(self): answers = [] - for r in self.region.all(): - laterality = self.get_laterality_string() + regions = self.region.all() + laterality = self.get_laterality_string() + if regions: + for r in regions: + for a in self.abnormality.all(): + answers.append("{}{} {}".format(laterality, r.name, a.name)) + answers.append("{} {}{}".format(a.name, laterality, r.name)) + answers.append("{} {}".format(r.name, a.name)) + answers.append("{} {}".format(a.name, r.name)) + else: for a in self.abnormality.all(): - answers.append("{}{} {}".format(laterality, r.name, a.name)) - answers.append("{} {}{}".format(a.name, laterality, r.name)) - answers.append("{} {}".format(r.name, a.name)) - answers.append("{} {}".format(a.name, r.name)) + laterality = self.get_laterality_string() + answers.append("{} {}".format(laterality, a.name)) + answers.append("{} {}".format(a.name, laterality)) + answers.append("{}".format(a.name)) + + compare_answers = self.get_compare_answers()