|
|
@@ -215,8 +215,8 @@ public interface ChargeFeeVoMapper {
|
|
|
" paymode=mzy_reqrec.paymode " +
|
|
|
" FROM mzy_reqrec " +
|
|
|
" WHERE case when '1'=#{caseType} then 0 else 1 end = dcount_no and " +
|
|
|
- " case when '1'=#{caseType} then op_day else closing_date end >=#{beginDate,jdbcType=TIMESTAMP} and " +
|
|
|
- " case when '1'=#{caseType} then op_day else closing_date end <=#{endDate,jdbcType=TIMESTAMP} " +
|
|
|
+ " case when '1'=#{caseType} then op_day else CONVERT(varchar(100), closing_date, 20) end >=#{beginDate,jdbcType=TIMESTAMP} and " +
|
|
|
+ " case when '1'=#{caseType} then op_day else CONVERT(varchar(100), closing_date, 20) end <=#{endDate,jdbcType=TIMESTAMP} " +
|
|
|
"group by receipt_bill," +
|
|
|
" serial_no," +
|
|
|
" patient_id," +
|
|
|
@@ -250,8 +250,8 @@ public interface ChargeFeeVoMapper {
|
|
|
" paymode=mzy_reqrec_b.paymode " +
|
|
|
" FROM mzy_reqrec_b " +
|
|
|
" WHERE case when '1'=#{caseType} then 0 else 1 end = dcount_no and " +
|
|
|
- " case when '1'=#{caseType} then op_day else closing_date end >=#{beginDate,jdbcType=TIMESTAMP} and " +
|
|
|
- " case when '1'=#{caseType} then op_day else closing_date end <=#{endDate,jdbcType=TIMESTAMP} " +
|
|
|
+ " case when '1'=#{caseType} then op_day else CONVERT(varchar(100), closing_date, 20) end >=#{beginDate,jdbcType=TIMESTAMP} and " +
|
|
|
+ " case when '1'=#{caseType} then op_day else CONVERT(varchar(100), closing_date, 20) end <=#{endDate,jdbcType=TIMESTAMP} " +
|
|
|
" group by receipt_bill," +
|
|
|
" serial_no," +
|
|
|
" patient_id," +
|
|
|
@@ -577,10 +577,10 @@ public interface ChargeFeeVoMapper {
|
|
|
" and print_closing_date=#{dcountDate,jdbcType=TIMESTAMP} ",
|
|
|
"</when>",
|
|
|
"<when test='beginDate!=null'>",
|
|
|
- " and print_closing_date >=#{beginDate,jdbcType=TIMESTAMP} ",
|
|
|
+ " and CONVERT(varchar(100), print_closing_date, 20) >=#{beginDate,jdbcType=TIMESTAMP} ",
|
|
|
"</when>",
|
|
|
"<when test='endDate!=null'>",
|
|
|
- " and print_closing_date <=#{endDate,jdbcType=TIMESTAMP} ",
|
|
|
+ " and CONVERT(varchar(100), print_closing_date, 20) <=#{endDate,jdbcType=TIMESTAMP} ",
|
|
|
"</when>",
|
|
|
"<when test='dcountDate == null and beginDate == null and endDate == null'>",
|
|
|
" and print_dcount_no =0 ",
|