|
@ -1013,7 +1013,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
" AND t.start_time <='"+endDate+"'"+
|
|
" AND t.start_time <='"+endDate+"'"+
|
|
" )";
|
|
" )";
|
|
}
|
|
}
|
|
sql += " AND d.del='1'AND d.charge_type is not null LIMIT " + (page - 1) * size + "," + size + "";
|
|
|
|
|
|
sql += " AND d.del='1'AND d.charge_type is not null AND d.outpatient_type is not null LIMIT " + (page - 1) * size + "," + size + "";
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
if(list!=null&&list.size()>0){
|
|
if(list!=null&&list.size()>0){
|
|
//获取排班
|
|
//获取排班
|
|
@ -2896,7 +2896,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
sql+=" AND d.consult_status = '"+consultStatus+"' ";
|
|
sql+=" AND d.consult_status = '"+consultStatus+"' ";
|
|
}
|
|
}
|
|
|
|
|
|
sql += " and d.del='1' and d.charge_type is not null order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
|
|
|
|
|
|
sql += " and d.del='1' and d.charge_type is not null AND d.outpatient_type is not null order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
|
|
|
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
logger.info("findDoctorByHospitalAndDiseaseAndDept end:"+DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));
|
|
logger.info("findDoctorByHospitalAndDiseaseAndDept end:"+DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));
|