Pain disappears usually by 3 months. I will advise you the following:
1. Hot fermentation for the shoulder.
2. Gentle exercises for flexion, extension, abdomen and rotations.
3. Do overhead activities/exercises.
For elbow:
1. Hot fermentation.
2. Gentle movements for the elbow flexion and extension. Forceful movements should be avoided, as this can cause myositis ossificans. These can be taken in a physiotherapy clinic.