Suggest Treatments For Shoulder Pain Causing Trouble In Moment

I am having shoulder pain. I am a breast cancer survivor having had conservative surgery. I am also a type 2 diabetic. I am not aware of an acute injury but do repetitive movements working at a desk. I am currently in PT. Is this the correct treatment? I am using ice and advil. Is this the correct treatment and should I be seeing some other than my IM?