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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/activemq/HealthArtListener.java

@@ -23,9 +23,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.TextMessage;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by chenweida on 2017/9/9.
@@ -98,6 +96,12 @@ public class HealthArtListener implements MessageListener {
//            HealthEduArticleES one = (HealthEduArticleES)JSONObject.toBean(JSONObject.fromObject(textMessage.getText()),HealthEduArticleES.class);
//            logger.info(jo.toString());
//            System.out.printf(healthEduArticleES.toString());
            net.sf.json.JSONArray jsonArray = obj.get("openidSet")!=null?(net.sf.json.JSONArray)obj.get("openidSet"):null;
            Set<String> openidSet = new HashSet<>();
            for(int i=0;i<jsonArray.size();i++){
                openidSet.add(jsonArray.get(i).toString());
            }
            healthEduArticleES.setOpenidSet(openidSet);
            sendWxTemplateAndIM(healthEduArticleES);
            //返回服务器表示消息消费成功
            message.acknowledge();

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/wechat/util/WeiXinOpenIdUtils.java

@@ -113,6 +113,7 @@ public class WeiXinOpenIdUtils {
                String memberCode = (String) member.get("family_member");
                if (StringUtils.isNotBlank(memberCode)) {
                    Patient p = patientDao.findByCode(memberCode);
                    if(p==null)continue;
                    if (StringUtils.isNotBlank(p.getOpenid())&&!p.getOpenid().equals(openid)) {
                        if(!map.containsKey(p.getOpenid())){
                            map.put(p.getOpenid(),p.getOpenid());