|
@ -621,16 +621,16 @@ public class PrescriptionExpressageService extends BaseService {
|
|
|
return rs;
|
|
|
}
|
|
|
|
|
|
public Map<String, Object> getPresEsPayList(String keyWord, String state, String type, String startDate, String endDate, String operator,String flag,Integer page, Integer pageSize) {
|
|
|
public Map<String, Object> getPresEsPayList(String doctor,String keyWord, String state, String type, String startDate, String endDate, String operator,String flag,Integer page, Integer pageSize) {
|
|
|
|
|
|
Map<String, Object> map = new HashedMap();
|
|
|
|
|
|
Doctor d = doctorDao.findByCode(doctor);
|
|
|
String totalSql = "SELECT count(1) AS total " +
|
|
|
" FROM " +
|
|
|
" wlyy_prescription p " +
|
|
|
" JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
|
|
|
" WHERE" +
|
|
|
" 1=1 ";
|
|
|
" p.hospital = '"+d.getHospital()+"' ";
|
|
|
totalSql = setSQL( totalSql,keyWord,state,type,startDate,endDate,operator,flag);
|
|
|
totalSql += " AND p.`status`>=50 ";
|
|
|
List<Map<String, Object>> totallist = jdbcTemplate.queryForList(totalSql);
|
|
@ -660,7 +660,7 @@ public class PrescriptionExpressageService extends BaseService {
|
|
|
" wlyy_prescription p " +
|
|
|
" JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
|
|
|
" WHERE" +
|
|
|
" 1=1 ";
|
|
|
" p.hospital = '"+d.getHospital()+"' ";
|
|
|
sql = setSQL( sql,keyWord,state,type,startDate,endDate,operator,flag);
|
|
|
sql += " AND p.`status`>=50 " +
|
|
|
" ORDER BY py.create_time DESC " +
|