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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -686,7 +686,7 @@ public class SpecialistService extends BaseService {
                json.put("keyword1", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
                json.put("keyword2", temp.getKeyword2().replace("key1", doctor.getName()));
                json.put("remark", temp.getRemark().replace("key1", StringUtils.isBlank(remark)?"详情请联系您的专科医生":remark));
                json.put("first", temp.getFirst().replace("key1", patient.getName()));
                json.put("first", temp.getFirst().replace("key1", patient.getName()).replace("key2", doctor.getName()));
            } else {
                //同意
                temp = templateConfigDao.findByScene("template_deal_with", "tdwspagr");
@@ -694,7 +694,7 @@ public class SpecialistService extends BaseService {
                json.put("keyword1", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
                json.put("keyword2", temp.getKeyword2().replace("key1", doctor.getName()));
                json.put("remark", temp.getRemark());
                json.put("first", temp.getFirst().replace("key1", patient.getName()));
                json.put("first", temp.getFirst().replace("key1", patient.getName()).replace("key2", doctor.getName()));
            }
            logger.info("weiTempJOSN:"+json.toString());

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

@@ -865,8 +865,8 @@ public class WeiXinEventProcess {
        Map<String, String> articleConsult = new HashMap<>();
        articleConsult.put("Url", url);
        articleConsult.put("Title", "您需要开通家庭医生与专科医生的”三师共管“的服务邀请");
        articleConsult.put("Description", "优秀的专科医生团队为您提供个性化健康服务");
        articleConsult.put("Title", "您有一个开通专科服务的邀请，点击查看");
        articleConsult.put("Description", "家庭医生协助专科医生团队为您提供专项服务");
        articleConsult.put("PicUrl", picUrlConsult);
        articles.add(articleConsult);