|
@@ -61,7 +61,7 @@
|
|
|
<select id="getCollections" resultType="com.imed.costaccount.model.vo.CollectionVO">
|
|
|
select file_id, date_year as `year`, date_month as `month`, sum(amount) as amount
|
|
|
from cost_income_group
|
|
|
- where hosp_id = #{hospId}
|
|
|
+ where hosp_id = #{hospId} and delete_time = 0
|
|
|
<if test="date != null and date != ''">
|
|
|
and date_year = YEAR(concat(#{date},'01')) and date_month = MONTH(concat(#{date},'01'))
|
|
|
</if>
|
|
@@ -72,7 +72,7 @@
|
|
|
<select id="getCollectionCount" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
from cost_income_group
|
|
|
- where hosp_id = #{hospId}
|
|
|
+ where hosp_id = #{hospId} and delete_time = 0
|
|
|
<if test="date != null and date != ''">
|
|
|
and date_year = YEAR(concat(#{date},'01')) and date_month = MONTH(concat(#{date},'01'))
|
|
|
</if>
|