The shortcomings in previous treatments of boundary and junction conditions for the self-consistent density profile are analysed carefully. In order to reflect precisely the factual boundaries, the vacuum boundary and the plasma rest upstream are connected to the upper and lower density profile shelves by the self-similar solutions respectively, and the perfect matching at the sonic point is realized. Our analytic results agree well with computer simulation