Composition scheme under GST.

Dear friends

My brother is carrying medical business i.e Medicines purchased from distributors and selling to final consumers.The business status is partnership firm, was registered under GST on 10/09/2017 under composition scheme. We filed quarterly returns(GSTR-4) up-to 31/03/2018.
He was withdrawan composition scheme on 30/04/2018 to Normal tax payer.
In the month of April No GST return filed by him. For the month of May &June 2018 ,he filed GSTR-3B. For the quarter APRIL-JUNE,
He required to file both GSTR-1 and GSTR-4.

We are in dilemma.

In GSTR-4,
shall we enter three months turnover or turnover for the month of APRIL, as we withdrawan composition scheme on 30/04/2018.

Second doubt is
In GSTR-1, we entered invoices of MAY and JUNE months.
Shall we required to enter invoices of APRIL month in GSTR-4 ?