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

@@ -586,7 +586,7 @@ public class JMJkEduArticleService extends BaseService {
                case "1":{whereSql+=" and h.province = '"+currentUserRole+"'" ;break;}
                case "2":{whereSql+=" and h.city = '"+currentUserRole+"'" ;break;}
                case "3":{whereSql+=" and h.town = '"+currentUserRole+"'" ;break;}
                case "4":return;
                case "4":{whereSql+=" and h.code = '"+currentUserRole+"'" ;break;}
            }
        }
@@ -604,11 +604,15 @@ public class JMJkEduArticleService extends BaseService {
        }
        if (!StringUtils.isEmpty(labelDisease)) {
            if (!whereSql.endsWith(" and ( ")) {
                whereSql += " or (l.label_type = 3 AND l.label in (" + labelDisease + "))) ";
                whereSql += " or (l.label_type = 3 AND l.label in (" + labelDisease + ")) ";
            } else {
                whereSql += " (l.label_type = 1 AND l.label in (" + labelDisease + "))) ";
                whereSql += " l.label_type = 1 AND l.label in (" + labelDisease + ")) ";
            }
        }
        if (!StringUtils.isEmpty(labelHealth) || !StringUtils.isEmpty(labelDisease)) {
            whereSql += ")";
        }
        
        tableSql += " left join wlyy_patient p on p.code=w.patient AND p.openid IS NOT NULL and p.openid <>''";
        if (!StringUtils.isEmpty(labelSex)) {
            whereSql += " and p.sex in (" + labelSex + ") ";
@@ -903,7 +907,10 @@ public class JMJkEduArticleService extends BaseService {
            sql= sql + " and level1Type = '"+level1Type+"' ";
        }
        
        sql= sql+  " order by createTime desc limit " + page + "," + pagesize;
        if(page !=0 && pagesize !=0){
            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/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -23,7 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.InputStream;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
 * Created by Trick on 2017/11/14.
@@ -126,7 +128,9 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                                      @ApiParam(name = "sEcho", value = "插件自带")
                                      @RequestParam(value = "sEcho", required = false) Integer sEcho,
                                      @ApiParam(name = "roleType", value = "1、普通医生，2、管理员")
                                      @RequestParam(value = "roleType", required = false) Integer roleType){
                                      @RequestParam(value = "archive", required = false) Integer roleType,
                                      @ApiParam(name = "patient", value = "居民CODE")
                                      @RequestParam(value = "patient", required = false) String patient){
        try {
            if(StringUtils.isEmpty(currentUserRole)){
                currentUserRole=getCurrentRoleCode();
@@ -137,6 +141,29 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            JSONObject response = jmJkEduArticleService.queryArticlePcList(firstLevelCategoryId,secondLevelCategoryId,insertTimeStart,insertTimeEnd,articlelevel,articleTitle,
                    getUID(),currentUserRole,currentUserRoleLevel,isAuthentication,isMyArticle,page,pageSize,sEcho,roleType);
            
            
            //判断文章列表是否有推送过该居民
            if(StringUtils.isNotBlank(patient)){
                com.alibaba.fastjson.JSONArray pushresponse = jmJkEduArticleService.pushArticleLogs(0,0,patient,"");
                Set<String> articleids = new HashSet<>();
                if(pushresponse.size() > 0){
                    for (int i = 0; i < pushresponse.size(); i++) {
                        articleids.add(pushresponse.getJSONObject(i).getString("articleId"));
                    }
                }
                
                JSONArray datas = response.getJSONObject("data").getJSONArray("aaData");
                if(datas.size() > 0 && !articleids.isEmpty()){
                    for (int i = 0; i < datas.size(); i++) {
                        String dataarticleid = datas.getJSONObject(i).getString("articleid");
                        if(articleids.contains(dataarticleid)){
                            datas.getJSONObject(i).put("ispush","1");
                        }
                    }
                    response.getJSONObject("data").put("aaData",datas);
                }
            }
            return write(200,"查询成功！","data",response);
        } catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -707,6 +707,7 @@ public class DoctorPatientGroupController extends BaseController {
                json.put("standardStatus",temp.getStandardStatus());
                //设备状态：0未绑定，1血糖仪，2血压仪，3血糖仪+血压仪
                json.put("deviceType",temp.getDeviceType());
                json.put("openid",temp.getOpenid());
                return write(200, "患者信息查询成功！", "data", json);
            } else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -71,10 +71,12 @@ public class ThirdJkEduArticleController extends BaseController {
                                           @ApiParam(name = "pageIndex", value = "起始页数 0开始，默认0")
                                           @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
                                           @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                           @RequestParam(value = "pageSize", required = false) Integer pageSize){
                                           @RequestParam(value = "pageSize", required = false) Integer pageSize,
                                           @ApiParam(name = "userType", value = "用户类型：1医生，2居民",defaultValue = "1")
                                           @RequestParam(value = "userType", required = true) Integer userType){
        try {
            com.alibaba.fastjson.JSONArray response = thirdJkEduArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getUID(),1,myArticle);
//            com.alibaba.fastjson.JSONArray response = thirdJkEduArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"0de7295862dd11e69faffa163e8aee56",1);
            com.alibaba.fastjson.JSONArray response = thirdJkEduArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getRepUID(),userType,myArticle);
//            com.alibaba.fastjson.JSONArray response = thirdJkEduArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"812f75071f434fde9a1fb64c6213a897",userType,myArticle);
            return write(200,"查询成功！","data",response);
        }catch (Exception e){
            e.printStackTrace();