|
@ -57,6 +57,7 @@ public class PrescriptionService extends BaseService {
|
|
|
"WHEN 60 THEN '配药成功/待配送' " +
|
|
|
"WHEN 65 THEN '配送中' " +
|
|
|
"WHEN 100 THEN '配送到患者手中/已完成' " +
|
|
|
"WHEN-5 THEN '线下取消' " +
|
|
|
"WHEN-4 THEN '线下退费' " +
|
|
|
"WHEN-3 THEN '支付超时' " +
|
|
|
"WHEN-2 THEN '患者自己取消' " +
|
|
@ -111,12 +112,12 @@ public class PrescriptionService extends BaseService {
|
|
|
|
|
|
//开始时间
|
|
|
if (StringUtils.isNotBlank(beginDate) && !" 00:00:00".equals(beginDate)) {
|
|
|
prescriptionsql = prescriptionsql + " and p1.create_time <= '" + beginDate+"' ";
|
|
|
prescriptionsql = prescriptionsql + " and p1.create_time >= '" + beginDate+"' ";
|
|
|
}
|
|
|
|
|
|
//结束时间
|
|
|
if (StringUtils.isNotBlank(endDate) && !" 23:59:59".equals(endDate)) {
|
|
|
prescriptionsql = prescriptionsql + " and p1.create_time >= '" + endDate+"' ";
|
|
|
prescriptionsql = prescriptionsql + " and p1.create_time <= '" + endDate+"' ";
|
|
|
}
|
|
|
|
|
|
prescriptionsql = prescriptionsql+ ") p ORDER BY p.create_time DESC";
|
|
@ -125,7 +126,7 @@ public class PrescriptionService extends BaseService {
|
|
|
if(1 == page){
|
|
|
page = page-1;
|
|
|
}
|
|
|
prescriptionsql = prescriptionsql +" limit " + page+", "+pageSize;
|
|
|
prescriptionsql = prescriptionsql +" limit " + page*pageSize+", "+pageSize;
|
|
|
}
|
|
|
|
|
|
list = jdbcTemplate.query(prescriptionsql,new BeanPropertyRowMapper(PrescriptionVO.class));
|