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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -1847,7 +1847,7 @@ public class StatisticsESService {
            }
        }
//        quotaTime = "2017-10-19 00:00:00";
        List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(quotaTime,area,Integer.parseInt(level),"24","2");
        List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(null,quotaTime,area,Integer.parseInt(level),"24","1");
        JSONArray array = new JSONArray();
        for(SaveModel saveModel : list){
            JSONObject jsonObject = new JSONObject();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/fzzb/HealthEducationArticleService.java

@@ -32,7 +32,9 @@ public class HealthEducationArticleService extends BaseService{
    @Autowired
    private DoctorDao doctorDao;
    private String baseUrl = "http://service.yihu.com:8085/WsPlatform/rest";
//    private String baseUrl = "http://service.yihu.com:8085/WsPlatform/rest";
    private String baseUrl = "http://172.17.110.230:83/WsPlatform/rest";
//    private String baseUrl = "http://172.19.103.87:9088/JkEdu";
    @Value("${yihu.yihu_OpenPlatform_appId}")
    private String clientId;
@@ -46,6 +48,7 @@ public class HealthEducationArticleService extends BaseService{
    private String cancelArticleCollection = "JkEdu.Behavior.cancelArticleCollection";//取消收藏接口
    private String saveArticleCollection = "JkEdu.Behavior.saveArticleCollection";//医生收藏接口
    private String getDoctorArticalByUserId = "JkEdu.Article.getDoctorArticalByUserId";//医生发表文章接口
    private String getArticalList = "JkEdu.Article.getArticalList";//获取文章列表 多ID
    /**
     * 封装入参
@@ -308,4 +311,25 @@ public class HealthEducationArticleService extends BaseService{
        }
    }
    public JSONArray getArticalList(String articleId,int articleState,int pageIndex,int pageSize) throws Exception{
        JSONArray re = new JSONArray();
        JSONObject json = null;
        try{
            JSONObject param = new JSONObject();
            param.put("articleId",articleId);
            param.put("articleState",articleState);
            param.put("pageIndex",pageIndex);
            param.put("pageSize",pageSize);
            String response = httpClientUtil.httpPost(baseUrl,getParamsMap(getArticalList,param.toString(),"1"));
            json = JSON.parseObject(response);
        }catch (Exception e){
            e.printStackTrace();
            return re;
        }
        if("10000".equals(json.getString("Code"))){
            return json.getJSONArray("Result");
        }else {
            throw new Exception(json.getString("Message"));
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ElasticsearchUtil.java

@@ -628,6 +628,20 @@ public class ElasticsearchUtil {
        List list = findDateQuotaLevel1(quotaDate, quotaDate, area, level, index, timelevel,null, null, null);
        return list;
    }
    /**
     * 1级维度
     * 查询某一天某一个所有1级维度下的指标 例如某个机构下的所有维度的患者列表
     *
     * @param area      code  厦门市 350200
     * @param level     等级 1 省 2 市 3 区县 4 机构 5团队
     * @param index     指标code
     * @param timelevel // 1日 2年
     * @return
     */
    public List<SaveModel> findOneDateQuotaLevel1(String startDate,String endDate, String area, int level, String index, String timelevel) throws Exception {
        List list = findDateQuotaLevel1(startDate, endDate, area, level, index, timelevel,null, null, null);
        return list;
    }
    /**
     * 2级维度
     * 查询某一天某一个2级维度的某个1级维度和2级维度下的指标  例如查询65岁以上的高血压患者

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

@@ -612,9 +612,9 @@ public class DoctorHealthEduArticleController extends WeixinBaseController {
                                       @ApiParam(name = "firstLevelCategoryId", value = "一级类别ID ，多个逗号隔开")
                                       @RequestParam(value = "firstLevelCategoryId", required = false) String firstLevelCategoryId,
                                       @ApiParam(name = "pageIndex", value = "起始页数 0开始，默认0")
                                       @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
                                       @RequestParam(value = "pageIndex", required = false, defaultValue = "0") Integer pageIndex,
                                       @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                       @RequestParam(value = "pageSize", required = false) Integer pageSize){
                                       @RequestParam(value = "pageSize", required = false, defaultValue = "5") Integer pageSize){
        try {
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getDoctorArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getUID());
//            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getDoctorArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"0de7295862dd11e69faffa163e8aee56");
@@ -717,9 +717,9 @@ public class DoctorHealthEduArticleController extends WeixinBaseController {
                                       @ApiParam(name = "firstLevelCategoryId", value = "一级类别ID ，多个逗号隔开")
                                       @RequestParam(value = "firstLevelCategoryId", required = false) String firstLevelCategoryId,
                                       @ApiParam(name = "pageIndex", value = "起始页数 0开始，默认0")
                                       @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
                                       @RequestParam(value = "pageIndex", required = false, defaultValue = "0") Integer pageIndex,
                                       @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                       @RequestParam(value = "pageSize", required = false) Integer pageSize){
                                       @RequestParam(value = "pageSize", required = false, defaultValue = "5") Integer pageSize){
        try {
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getDoctorArticalByUserId(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getUID());
//            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getDoctorArticalByUserId(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"0de7295862dd11e69faffa163e8aee56");
@@ -730,4 +730,22 @@ public class DoctorHealthEduArticleController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "getArticalList",method = RequestMethod.GET)
    @ApiOperation("获取文章列表 多ID")
    public String getDoctorArticalByUserId(@ApiParam(name = "articleId", value = "文章ID")
                                           @RequestParam(value = "articleId", required = false) String articleId,
                                           @ApiParam(name = "pageIndex", value = "起始页数 0开始，默认0")
                                           @RequestParam(value = "pageIndex", required = false ,defaultValue = "0") int pageIndex,
                                           @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                           @RequestParam(value = "pageSize", required = false ,defaultValue = "5") int pageSize){
        try {
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getArticalList(articleId,1,pageIndex,pageSize);
            return write(200,"查询成功！","data",response);
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败！");
        }
    }
}