|
@ -576,7 +576,12 @@ public class PrescriptionInfoService extends BaseService {
|
|
|
pre_sql.append(" AND pr.patient = ?");
|
|
|
params.add(patient);
|
|
|
}
|
|
|
pre_sql.append(" GROUP BY pr.code ORDER BY pr.min_drug_day-TIMESTAMPDIFF(DAY, pr.pres_create_time, NOW()),pr.create_time ASC");
|
|
|
if(StringUtils.isNotBlank(state)&&"0,2,3,4,10".equals(state)){
|
|
|
pre_sql.append(" GROUP BY pr.code ORDER BY pr.min_drug_day-TIMESTAMPDIFF(DAY, pr.pres_create_time, NOW()),pr.create_time ASC");
|
|
|
}else{
|
|
|
pre_sql.append(" GROUP BY pr.code ORDER BY pr.create_time ASC");
|
|
|
}
|
|
|
|
|
|
if (page != null && page > 0 && size != null && size > 0) {
|
|
|
pre_sql.append(" LIMIT " + (page - 1) * size + "," + size);
|
|
|
}
|