Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/AllocationMapper.xml

@@ -29,7 +29,7 @@
         <result property="deleteTime" column="delete_time"/>
     </resultMap>
     <select id="queryAfterAllocationList" resultType="com.imed.costaccount.model.vo.AfterAllocationVO">
-        select * from cost_allocation where delete_time = 0 and hosp_id = #{hospId}
+        select * from cost_allocation_query where delete_time = 0 and hosp_id = #{hospId}
         <if test="dateYear != null">
             and date_year = #{dateYear} and date_month = #{dateMonth}
         </if>
@@ -39,7 +39,7 @@
         limit #{startIndex},#{pageSize}
     </select>
     <select id="queryAfterAllocationListCount" resultType="java.lang.Integer">
-        select count(*) from cost_allocation where delete_time = 0 and hosp_id = #{hospId}
+        select count(*) from cost_allocation_query where delete_time = 0 and hosp_id = #{hospId}
         <if test="dateYear != null">
             and date_year = #{dateYear} and date_month = #{dateMonth}
         </if>