Due to the impact of original buildings and an upstream middle bar on the new-built ship lock of the Qixingdun junction，there are poor navigable flow conditions in the upstream areas. To solve this problem，this paper utilizes the overall hydraulic physical model and self-propelled ship model test to study the changes in the upstream flow conditions for the ship lock under different ship lock layout schemes and puts forward specific measures to improve flow conditions. The following results are obtained：1）Increasing the flow area near the entrance area and adjusting the route according to the flow direction of the model test can effectively improve the navigable flow conditions of the upstream entrance area and connecting section for the Qixingdun ship lock. 2）When the ship lock is arranged far from the shore and the water flow concentrates and obliquely passes through the entrance area，arranging a spur dike upstream to disperse the water flow in advance has a significant effect on improving the navigable flow conditions in the upstream entrance area for the ship lock.