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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/template/DoctorFeldsherTemplateService.java

@@ -54,14 +54,16 @@ public class DoctorFeldsherTemplateService extends BaseService {
        JSONObject sendJson = new JSONObject();
        if (type == 1) {
            String url = "jkjl/html/health-index-add-bloodsugar.html?openid=" + openId + "&toUser=" + patient + "&toName=" +name+"&represented="+patient;
            String url = "jkjl/html/health-index-add-bloodsugar.html?represented="+patient;
            String first = name + "您好，请按照您的血糖监测方案测量" + comment + "血糖数据。";
            String remark = "您可使用智能设备测量后自动上传数据，或点击详情手动上传测量数据";
            sendJson.put("keyword1", "血糖测量");
            sendJson.put("keyword2", dateFormat.format(new Date()));
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url);//带参数的模板跳转链接
            sendJson.put("url", url+ "&openid=" + openId +"&toUser=" + patient + "&toName=" +name);//带参数的模板跳转链接
            sendJson.put("toUser", patient);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, openId, name, sendJson);
            //发送代理人
@@ -70,28 +72,25 @@ public class DoctorFeldsherTemplateService extends BaseService {
                for (int i = 0; i < jsonArray.length(); i++) {
                    JSONObject j = jsonArray.getJSONObject(i);
                    Patient member = (Patient) j.get("member");
                    int representedStart = url.indexOf("&represented=");
                    int representedEnd = url.length();
                    String represented = url.substring(representedStart, representedEnd);
                    url = url.replace(represented, "&represented=" + member.getCode());
                    sendJson.remove("toUser");
                    sendJson.put("toUser", member.getCode());//带参数的模板跳转链接
                    sendJson.remove("url");
                    sendJson.put("url", url+ "&openid=" + member.getOpenid() +"&toUser=" + member.getCode() + "&toName=" +name);
                    //name患者姓名
                    sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    sendJson.put("url", url);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, member.getOpenid(), name, sendJson);
                }
            }
            logger.info("sendJson: " + sendJson);
        }
        if (type == 2) {
            String url = "jkjl/html/health-index-add-bloodpressure.html?openid=" + openId + "&toUser=" + patient + "&toName=" +name+"&represented="+patient;
        }else if (type == 2) {
            String url = "jkjl/html/health-index-add-bloodpressure.html?represented="+patient;
            String first = name + "您好，请按照您的血压监测方案测量血压数据。";
            String remark = "您可使用智能设备测量后自动上传数据，或点击详情手动上传测量数据";
            sendJson.put("keyword1", "血压测量");
            sendJson.put("keyword2", dateFormat.format(new Date()));
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url);//带参数的模板跳转链接
            sendJson.put("url", url+ "openid=" + openId +"&toUser=" + patient + "&toName=" +name);//带参数的模板跳转链接
            sendJson.put("toUser", patient);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, openId, name, sendJson);
            //发送代理人
@@ -100,14 +99,14 @@ public class DoctorFeldsherTemplateService extends BaseService {
                for (int i = 0; i < jsonArray.length(); i++) {
                    JSONObject j = jsonArray.getJSONObject(i);
                    Patient member = (Patient) j.get("member");
                    int representedStart = url.indexOf("&represented=");
                    int representedEnd = url.length();
                    String represented = url.substring(representedStart, representedEnd);
                    url = url.replace(represented, "&represented=" + member.getCode());
                    JSONObject data = sendJson;
                    data.remove("toUser");
                    data.put("toUser", member.getCode());//带参数的模板跳转链接
                    data.remove("url");
                    data.put("url", url+ "&openid=" + member.getOpenid() +"&toUser=" + member.getCode() + "&toName=" +name);
                    //name患者姓名
                    sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    sendJson.put("url", url);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, member.getOpenid(), name, sendJson);
                    data.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, member.getOpenid(), name, data);
                }
            }
            logger.info("sendJson: " + sendJson);