|
@ -1184,7 +1184,6 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
|
|
|
public JSONArray pushArticleLogs(int page, int pagesize, String patientCode,String level1Type) throws Exception {
|
|
public JSONArray pushArticleLogs(int page, int pagesize, String patientCode,String level1Type) throws Exception {
|
|
|
|
|
|
pagesize = page * pagesize;
|
|
|
|
page = (page - 1) * pagesize;
|
|
page = (page - 1) * pagesize;
|
|
|
|
|
|
String sql = "SELECT * FROM " + esType + " where patientCode= '" + patientCode + "' and userType = 1";
|
|
String sql = "SELECT * FROM " + esType + " where patientCode= '" + patientCode + "' and userType = 1";
|
|
@ -1192,9 +1191,9 @@ public class JMJkEduArticleService extends BaseService {
|
|
if(!StringUtils.isEmpty(level1Type)){
|
|
if(!StringUtils.isEmpty(level1Type)){
|
|
sql= sql + " and firstLevelCategoryId = '"+level1Type+"' ";
|
|
sql= sql + " and firstLevelCategoryId = '"+level1Type+"' ";
|
|
}
|
|
}
|
|
|
|
|
|
if(page !=0 && pagesize !=0){
|
|
|
|
sql= sql+ " order by createTime desc limit " + page + "," + pagesize;
|
|
|
|
|
|
sql += " order by createTime desc ";
|
|
|
|
if(pagesize !=0){
|
|
|
|
sql= sql+ " limit " + page + "," + pagesize;
|
|
}
|
|
}
|
|
|
|
|
|
List<HealthEduArticleES> esList = elasticsearchUtil.excute(sql, HealthEduArticleES.class, esIndex, esType);
|
|
List<HealthEduArticleES> esList = elasticsearchUtil.excute(sql, HealthEduArticleES.class, esIndex, esType);
|