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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -387,27 +387,43 @@ public class WeiXinEventProcess {
    public void setWifi(String openid,List<Map<String, String>> articles, Properties systemConf){
        try{
            String sql = "SELECT t.id FROM wlyy_patient t WHERE t.openid = '"+openid+"'";
            //判断是否是莲前社区签约居民
            String sql = "SELECT " +
                    " COUNT(1) AS total " +
                    " FROM " +
                    " wlyy_patient p " +
                    " JOIN wlyy_sign_family f ON f.patient = p.`code` " +
                    " WHERE " +
                    " p.openid ='"+openid+"' " +
                    " AND f.`status` >0 " +
                    " AND f.expenses_status ='1' " +
                    " AND f.hospital = '3502030400'";
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            logger.info("setWifi_openid:"+openid+" openid_listSize:"+list.size());
            logger.info("hslq_Wifi_openid_info: "+openid);
            if(list!=null&&list.size()>0) {
                Map<String, String> articleConsult = new HashMap<>();
                // 图文URL
                String urlConsult = systemConf.getProperty("patient_wifi_url");
                // 图文消息图片URL
                String picUrlConsult = systemConf.getProperty("patient_wifi_pic_url");
                // URL设置服务器URL、AppId
                urlConsult = urlConsult.replace("{server}", wechat_base_url)
                        .replace("{appId}", appId);
                //图片地址
                picUrlConsult = picUrlConsult.replace("{server}", serverUrl);
                articleConsult.put("Url", urlConsult);
                articleConsult.put("Title", "一键上网（莲前卫生服务中心家庭医生为您服务）");
                articleConsult.put("Description", "一键上网（莲前卫生服务中心家庭医生为您服务）");
                articleConsult.put("PicUrl", picUrlConsult);
                articles.add(articleConsult);
                //判断是否是莲前社区签约居民
                Long cout = (Long)list.get(0).get("total");
                logger.info("hslq_Wifi_total_info:"+cout);
                if(cout>0){
                    Map<String, String> articleConsult = new HashMap<>();
                    // 图文URL
                    String urlConsult = systemConf.getProperty("patient_wifi_url");
                    // 图文消息图片URL
                    String picUrlConsult = systemConf.getProperty("patient_wifi_pic_url");
                    // URL设置服务器URL、AppId
                    urlConsult = urlConsult.replace("{server}", wechat_base_url)
                            .replace("{appId}", appId);
                    //图片地址
                    picUrlConsult = picUrlConsult.replace("{server}", serverUrl);
                    articleConsult.put("Url", urlConsult);
                    articleConsult.put("Title", "一键上网（莲前卫生服务中心家庭医生为您服务）");
                    articleConsult.put("Description", "一键上网（莲前卫生服务中心家庭医生为您服务）");
                    articleConsult.put("PicUrl", picUrlConsult);
                    articles.add(articleConsult);
                }
            }
        }catch (Exception e){
            logger.info(e.getMessage());