Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/AllocationQueryMapper.xml

@@ -45,9 +45,9 @@
     <select id="getCountByRespAndAccounts" resultType="java.math.BigDecimal">
         select IFNULL(sum(amount), 0)
         from cost_allocation_query
-        where date_year = 2021
-        and date_month = 1
-        and hosp_id = 11
+        where date_year = #{dateYear}
+        and date_month = #{month}
+        and hosp_id = #{hospId}
         and responsibility_code = #{code}
         and accounting_code in
         <foreach collection="accountCodes" item="item" open="(" separator="," close=")">
@@ -58,9 +58,9 @@
     <select id="getTotalByAccountAndResps" resultType="java.math.BigDecimal">
         select IFNULL(sum(amount), 0)
         from cost_allocation_query
-        where date_year = 2021
-        and date_month = 1
-        and hosp_id = 11
+        where date_year = #{dateYear}
+        and date_month = #{month}
+        and hosp_id = #{hospId}
         and accounting_code = #{code}
         and responsibility_code in
         <foreach collection="respCodes" item="item" open="(" separator="," close=")">
@@ -70,9 +70,9 @@
     <select id="getTotalByAccountAndRespCode" resultType="java.math.BigDecimal">
         select IFNULL(sum(amount), 0)
         from cost_allocation_query
-        where date_year = 2021
-        and date_month = 1
-        and hosp_id = 11
+        where date_year = #{dateYear}
+          and date_month = #{month}
+          and hosp_id = #{hospId}
         and accounting_code =  #{accountCode}
         and responsibility_code = #{responsibilityCode}
     </select>