Merge branch 'dev' of huangwenjie/patient-co-management into dev

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

@@ -1069,7 +1069,7 @@ public class JMJkEduArticleService extends BaseService {
     * 一键修改居民推送文章的文章为已读
     * @param patient
     */
    public void readAllArticleNew(String patient){
    public void readAllArticleNew(String patient,String firstLevelCategoryId){
        JestClient jestClient = null;
    
        try {
@@ -1078,6 +1078,7 @@ public class JMJkEduArticleService extends BaseService {
            searchSourceBuilder.query(
                    new BoolQueryBuilder()
                            .must(QueryBuilders.matchQuery("patientCode", patient))
                            .must(QueryBuilders.matchQuery("firstLevelCategoryId", firstLevelCategoryId))
            );
            Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(esIndex).addType(esType).build();
            SearchResult result = jestClient.execute(search);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -207,12 +207,13 @@ public class HealthEduArticleController extends BaseController {
    @RequestMapping(value = "/readAllArticle", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("对当前用户的所有未读文章设置为已读")
    public String readAllArticle() {
    public String readAllArticle(@ApiParam(name = "firstLevelCategoryId", value = "一级分类ID")
                                     @RequestParam(value = "firstLevelCategoryId", required = true) String firstLevelCategoryId) {
        try {
//            String patient = getUID();
            String patient = getRepUID();
//            healthEduArticleService.readAllArticle(patient);
            jmJkEduArticleService.readAllArticleNew(patient);
            jmJkEduArticleService.readAllArticleNew(patient,firstLevelCategoryId);
            return write(200, "更改状态成功！");
        } catch (Exception e) {
            error(e);