|
@ -499,12 +499,9 @@ public class RehabilitationManageService {
|
|
if (StringUtils.isNotBlank(doctorCode)) {
|
|
if (StringUtils.isNotBlank(doctorCode)) {
|
|
sql += " and d.doctor='" + doctorCode + "' ";
|
|
sql += " and d.doctor='" + doctorCode + "' ";
|
|
}
|
|
}
|
|
//sql+=" and i.code="+searchTask+" " ;
|
|
|
|
} else {
|
|
} else {
|
|
sql += " and i.code=" + searchTask + " ";
|
|
sql += " and i.code=" + searchTask + " ";
|
|
}/*else if(searchTask==5){
|
|
|
|
sql+=" and i.reserve=1 " ;
|
|
|
|
}*/
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
if (taskExecutor.equals("1")) { //我的任务
|
|
if (taskExecutor.equals("1")) { //我的任务
|
|
sql += "and d.doctor='" + doctorCode + "' ";
|
|
sql += "and d.doctor='" + doctorCode + "' ";
|
|
@ -518,7 +515,7 @@ public class RehabilitationManageService {
|
|
if (status != null) {
|
|
if (status != null) {
|
|
sql += "and d.status=" + status;
|
|
sql += "and d.status=" + status;
|
|
}
|
|
}
|
|
sql += " order by d.execute_time desc ";
|
|
|
|
|
|
sql += " order by d.execute_time asc ";
|
|
sql = TransforSqlUtl.wlyy_rehabilitation_plan_detailAll2(sql);
|
|
sql = TransforSqlUtl.wlyy_rehabilitation_plan_detailAll2(sql);
|
|
List<Map<String, Object>> rehabilitationDetailList = jdbcTemplate.queryForList(sql);
|
|
List<Map<String, Object>> rehabilitationDetailList = jdbcTemplate.queryForList(sql);
|
|
|
|
|