Coding Hysteroscopic dialtion and Currettage

A patient underwent hysteroscopic aspiration curettage of uterus for disorder of menstruation and cervicitis.  What are the ICD and CPT codes that a coder should code?

DX     CODE       DESCRIPTION
1        616.0         Cervicitis/Endocervicitis

2        626.9         Disorder of Menstruation

PX     CODE      DESCRIPTION         
1         69.59        Aspiration Curettage of Uterus NEC

2         68.12         Hysteroscopy        

CPT   CODE      DESCRIPTION             

1        58558       Hysteroscopic Dilation and Currettage