每日推送-居民获取被推送列表，增加分类ID参数

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -710,7 +710,7 @@ public class JMJkEduArticleService extends BaseService {
        patientSet.addAll(resultList);
    }
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode) throws Exception {
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode,String level1Type) throws Exception {
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
@@ -718,7 +718,13 @@ public class JMJkEduArticleService extends BaseService {
//        StringBuffer sql2 = new StringBuffer("select *  from   " + esType +
//                " where  sendCode='" + sendCode + "' ");
//        sql2.append("  order by createTime limit " + page + "," + pagesize);
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' order by createTime desc limit " + page + "," + pagesize;
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' ";
        
        if(!StringUtils.isEmpty(level1Type)){
            sql= sql + " and level1Type = '"+level1Type+"' ";
        }
        
        sql= sql+  " order by createTime desc limit " + page + "," + pagesize;
        List<com.yihu.es.entity.HealthEduArticlePatient> esList = elasticsearchUtil.excute(sql, com.yihu.es.entity.HealthEduArticlePatient.class, esIndex, esType);
        HealthEduArticlePatientModel heapm = null;
        com.alibaba.fastjson.JSONObject article = null;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/jimeiJkEdu/PatientJMJkEduArticleController.java

@@ -27,9 +27,10 @@ public class PatientJMJkEduArticleController extends BaseController {
    @ApiOperation("居民获取被推送文章列表 ")
    public String pushArticleLogs(
            @ApiParam(name = "page", value = "当前页 起始1", required = true) @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize){
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize,
            @ApiParam(name = "level1Type", value = "", required = false) @RequestParam(value = "level1Type", required = false) String  level1Type){
        try {
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getUID());
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getRepUID(),level1Type);
//            Long count = healthEducationArticleService.pushArticleLogsCount("ece5c665b16542b0847e52b4a9fee44a");
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -112,8 +112,8 @@ es:
#http://172.19.103.87:9088/JkEduWeb
jkEdu:
  web:
    articleBaseUrl: http://yihu.com:9088/
#    articleBaseUrl: http://172.19.103.87:9088/
#    articleBaseUrl: http://yihu.com:9088/
    articleBaseUrl: http://172.19.103.87:9088/
#消息队列
activemq: