@kingisaac95 I guess I didn't explain what I was trying to say well enough.
Looking at all of the different searches I see:
- Concept/Observation tab
- Patient Attributes tab (these two do not make intuitive sense together, so should be split out)
- Person Attributes
- Encounter tab
- Location (This doesn't make sense on an Encounter tab, it should get its own tab)
- Program Enrollment tab
- Drug Order
- Taking Drug
- Stopped/Changed Drug
- Composition tab
- Saved tab
- Saved definition
- Saved cohort
In most of the cases where we have two different forms on the same tab, it does not actually make logical sense to have them together. So, my suggestion is to redo the design of "do a search" from scratch, and consider getting rid of these horizontal tabs (since they're not the correct grouping).
Instead, we have 11 individual kinds of searches (those are the second-level things below the tabs), each of which could have a recognizable name, and we could put these 11 searches together in some new UI that you'd design. For example you could have 11 vertical tabs, and whichever you click on displays its form to the right. Or it could be an autocomplete text box for "What search do you want to do?" and if you type "Enc" and choose "by Encounter" you get the form for that search.
Now, in practice these would be big changes, and I imagine you're not looking to do a wholesale redesign of the cohort builder UI now. (If you are, I'm happy to look at possible mockups...)
So in real life I suggest that you just do something much more simple:
- Add a new tab titled "Demographics", as the very first tab
- if this doesn't fit, then rename the "Concept / Observation" tab to just "Observations", which is actually what it should be called.
- Move the "Search by Demographics" form to that tab.