Salpingotomy Code

My provider performed a Diagnostic-operative laparoscopy, right salpingotomy,lysis of adhesions, dilatation & curettage of uterus for diagnosis of right ectopic pregnancy,extensive pelvic adhesions and tissue in uterus, would I use procedure code 58673? For the D&C would it be 58120? Thank you for your help.