微信模板添加成员

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -651,7 +651,7 @@ public class FamilyMemberService extends BaseService {
     * @throws Exception
     */
    @Transactional
    public int addMenberByWXTemp(Long id, String state) throws Exception {
    public int addMenberByWXTemp(Long id, String state,String access_token) throws Exception {
        if (StringUtils.isNotBlank(state)) {
            //同意添加
            if ("1".equals(state)) {
@@ -663,6 +663,8 @@ public class FamilyMemberService extends BaseService {
                Patient p = patientDao.findByCode(temp.getPatient());
                Patient m = patientDao.findByCode(temp.getFamilyMember());
                System.out.println("----:openId "+p.getOpenid());
                if (p == null) {
                    return -1;
                }
@@ -677,6 +679,23 @@ public class FamilyMemberService extends BaseService {
                    //保存
                    temp.setState("1");
                    patientFamilyTempDao.save(temp);
                    if(StringUtils.isNotBlank(p.getOpenid())){
                        //发送添加成功消息模板
                        JSONObject json = new JSONObject();
                        json.put("first", p.getName() + ",您好！添加家人"+m.getName()+"申请成功。");
                        json.put("keyword1", "添加家人申请成功");
                        json.put("keyword2", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
//                        json.put("keyword3", m.getName());
//                        json.put("keyword4", relations.get(temp.getFamilyRelation()));
                        json.put("remark",
                                "家人："+m.getName()+"\n"+
                                "家庭关系："+relations.get(temp.getFamilyRelation())+"\n"+
                                "点击查看家人。");
                        System.out.println("-----sendMes----:openId "+p.getOpenid()+"-----access_token-----:"+access_token+"--json--");
                        //此消息为定向推送,无需家人代收
                        PushMsgTask.getInstance().putWxMsg(access_token, 13, p.getOpenid(), p.getName(), json);
                    }
                }
                return st;
                //不同意添加
@@ -783,9 +802,11 @@ public class FamilyMemberService extends BaseService {
        json.put("first", m.getName() + ",您好！" + p.getName() + "向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。");
        json.put("keyword1", "添加家人申请");
        json.put("keyword2", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
        json.put("keyword3", p.getName());
        json.put("keyword4", relations.get(relation));
        json.put("remark", "点击立即处理。");
//        json.put("keyword3", p.getName());
//        json.put("keyword4", relations.get(relation));
        json.put("remark", "申请人："+p.getName()+"\n"+
                 "家庭关系："+relations.get(relation)+"\n"+
                 "点击立即处理。");
        json.put("member", member);
        //此消息为定向推送,无需家人代收
        PushMsgTask.getInstance().putWxMsg(access_token, 12, m.getOpenid(), p.getName(), json);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -2316,9 +2316,9 @@ public class StatisticsAllService extends BaseService {
                    }
                }
            });
            //计算咨询总数
            Long signCout = getQuoTaResult(level,area);
            for(Map<String, Object> map :resultList){
                Long signCout = getQuoTaResult(level,area);
                Long bindCout = (Long)map.get("amount");
                if((signCout!=null&&signCout!=0)&&(bindCout!=null&&bindCout!=0)){
                    double rate = (double)bindCout/signCout*100;
@@ -2342,19 +2342,19 @@ public class StatisticsAllService extends BaseService {
     * @return
     */
    public Long getQuoTaResult(int level,String code){
        StringBuffer sql = new StringBuffer("SELECT t.result FROM wlyy_quota_result t WHERE t.quato_code ='1'AND t.quota_date = DATE_SUB(curdate(),INTERVAL 1 DAY) AND t.level1_type ="+level);
        StringBuffer sql = new StringBuffer("SELECT t.result FROM wlyy_quota_result t WHERE t.quato_code ='1'AND t.quota_date = DATE_SUB(curdate(),INTERVAL 1 DAY) AND t.level1_type ='"+level+"'");
        if(level ==1){
            //1:
            sql.append(" AND t.qkdoctor_code = "+code);
            sql.append(" AND t.qkdoctor_code = '"+code+"'");
        }else if(level == 2){
            //2社区机构
            sql.append(" AND t.org_code = "+code);
            sql.append(" AND t.org_code = '"+code+"'");
        }else if(level == 3){
            //3区级
            sql.append(" AND t.town = "+code);
            sql.append(" AND t.town = '"+code+"'");
        }else if(level == 4){
            //4市级
            sql.append(" AND t.city = "+code);
            sql.append(" AND t.city = '"+code+"'");
        }
            List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql.toString());

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -132,6 +132,7 @@ public class PatientService extends TokenService {
        if (!org.springframework.util.StringUtils.isEmpty(openid) && org.springframework.util.StringUtils.isEmpty(patient.getOpenid())) {
            patient.setOpenidTime(new Date());
        }
        //System.out.println("========openid=======");
        patient.setOpenid(openid);
        Patient ps = patientDao.save(patient);
        System.out.print(new JSONObject(ps));

patient-co-wlyy/src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -455,7 +455,7 @@ public class PushMsgTask {
                logger.info("type=====>openId " + openid);
            }else if(type == 12){
                temp.setUrl(url + "jtgx/html/appcation-msg-list.html?openid=" + openid+ "&member=" + json.getString("member"));
                temp.setUrl(url + "jtgx/html/application-msg-list.html?openid=" + openid+ "&member=" + json.getString("member"));
                temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
                WechatTemplateData  keyword1= new WechatTemplateData();
@@ -468,16 +468,40 @@ public class PushMsgTask {
                keyword2.setValue(json.getString("keyword2"));
                m.put("keyword2", keyword2);
                WechatTemplateData  keyword3= new WechatTemplateData();
                keyword3.setColor("#000000");
                keyword3.setValue(json.getString("keyword3"));
                m.put("keyword3", keyword3);
//                WechatTemplateData  keyword3= new WechatTemplateData();
//                keyword3.setColor("#000000");
//                keyword3.setValue(json.getString("keyword3"));
//                m.put("keyword3", keyword3);
//
//                WechatTemplateData  keyword4= new WechatTemplateData();
//                keyword4.setColor("#000000");
//                keyword4.setValue(json.getString("keyword4"));
//                m.put("keyword4", keyword4);
                WechatTemplateData  keyword4= new WechatTemplateData();
                keyword4.setColor("#000000");
                keyword4.setValue(json.getString("keyword4"));
                m.put("keyword4", keyword4);
            }else if(type == 13){
                temp.setUrl(url + "jtgx/html/family.html?openid=" + openid);
                temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
                WechatTemplateData  keyword1= new WechatTemplateData();
                keyword1.setColor("#000000");
                keyword1.setValue(json.getString("keyword1"));
                m.put("keyword1", keyword1);
                WechatTemplateData  keyword2= new WechatTemplateData();
                keyword2.setColor("#000000");
                keyword2.setValue(json.getString("keyword2"));
                m.put("keyword2", keyword2);
//                WechatTemplateData  keyword3= new WechatTemplateData();
//                keyword3.setColor("#000000");
//                keyword3.setValue(json.getString("keyword3"));
//                m.put("keyword3", keyword3);
//
//                WechatTemplateData  keyword4= new WechatTemplateData();
//                keyword4.setColor("#000000");
//                keyword4.setValue(json.getString("keyword4"));
//                m.put("keyword4", keyword4);
            }
            temp.setData(m);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -295,7 +295,7 @@ public class FamilyMemberController extends WeixinBaseController {
                                    @RequestParam("state") String state){
        try {
            int result = familyMemberService.addMenberByWXTemp(id,state);
            int result = familyMemberService.addMenberByWXTemp(id,state,getAccessToken());
            if(result==0){
                return error(-1, "不能添加自己");