微信模板BUG修复

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

@@ -823,14 +823,6 @@ public class PushMsgTask {
                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 keyword5 = new WechatTemplateData();
                keyword5.setColor("#000000");
                keyword5.setValue(json.getString("keyword5"));
                m.put("keyword5", keyword5);
            }else if (type == 23) {//健康银行积分提醒
                if (json.has("url")) {
                    temp.setUrl(url + json.getString("url"));
@@ -848,14 +840,6 @@ public class PushMsgTask {
                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 keyword5 = new WechatTemplateData();
                keyword5.setColor("#000000");
                keyword5.setValue(json.getString("keyword5"));
                m.put("keyword5", keyword5);
            }
            temp.setData(m);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java

@@ -135,10 +135,10 @@ public class DoctorDeviceController extends BaseController {
				first = templateConfig.getFirst();
				first = first.replace("key1",(deviceName==null?"":deviceName));
				remark = templateConfig.getRemark();
				String keyword1 = templateConfig.getKeyword1();
				sendJson.put("keyword1", keyword1);
				sendJson.put("keyword1", deviceName);
				sendJson.put("keyword2", device.getCzrq());
				sendJson.put("keyword3", templateConfig.getKeyword3());
				sendJson.put("first", first);
				sendJson.put("remark", remark);
				sendJson.put("url", templateConfig.getUrl());//带参数的模板跳转链接