Hello

primary advices :
1. drink plenty of water ( at least 3 liters daily ) 
2. if you have took your antibiotic for less than 10 days , continue till 14 days 
3. take ibuprofen for the pain ( 1 - 2 pills per time / 3 - 4 times daily at most or only with pain )
4. if your symptoms laster longer or become severe , consult a urologist soon 
- in any case , its better to do routine tests in the future when its possible 
Treatment of kidney stones :
1. consult your doctor ( internal medicine //urology ) to do the needed medical tests and determine the causes and treatment pathways 
1. in case of urinary tract infections , usually you start with antibiotics such as ceftrexone and cipro ( orally ) 
2. in case of kidney or urinary tract stones , doctors will do more advanced tests to check out whether stone could goes down by it self or need surgical need to relieve it ( kidney stones if smaller than 0.7 cm usually passes by it self )
3. there is some medications to relax the muscles of urinary tract and ease the urination process such as  tamsulosin
4. in case of chronic diseases , you will need  more advanced examnations .
 
Needed medical tests :
1. clinical check by doctor 
2. urine test 
3. imaging test such as ultrasound for kidney and urinary tract