It's the same as it was before... Day 1 for arrival at the ASQ, 14 (full) days in quarantine, Day 16 departure... nothing to do with when you arrive... ;-)
The result must not be older than 72h before departure (first flight), so the 16th for the test would be okay as well. Flight number for your CoE is the flight which arrives in Thailand.