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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -3986,7 +3986,7 @@ public class FamilyContractService extends BaseService {
        SignFamily sf = new SignFamily();
        String sql = "SELECT t.doctor,t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
        String sql = "SELECT t.doctor,t.doctor_health，t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
        List<Map<String, Object>> signs = jdbcTemplate.queryForList(sql);
        if (signs == null || signs.size() == 0) {
@@ -3994,7 +3994,7 @@ public class FamilyContractService extends BaseService {
        }
        Map<String, Object> sign = signs.get(0);
        //判断续签医生是否一致
        if (doctor.equals(sign.get("doctor"))) {
        if (doctor.equals(sign.get("doctor_health"))) {
            //如果一致保存团队信息
            sf.setRenewFlag("1");
            sf.setTeamCode((String) sign.get("teamCode"));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

@@ -1,5 +1,7 @@
package com.yihu.wlyy.web.wx;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.weixin.WeiXinCoreService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.HttpUtil;
@@ -45,6 +47,8 @@ public class WechatCoreController extends WeixinBaseController {
    private HttpUtil HttpUtil;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    private DoctorService doctorService;
    /**
     * 微信接口验证
@@ -225,4 +229,16 @@ public class WechatCoreController extends WeixinBaseController {
        String s = new String(tempArr);
        return s;
    }
    @RequestMapping(value = "/getDoctorActivityPath")
    @ResponseBody
    private String getDoctorActivityPath(String code){
        try {
            Doctor d = doctorService.findDoctorByCode(code);
            return write(-1, "获取成功!", "data", d.getActivityPath());
        }catch (Exception e){
            error(e);
            return error(-1, "获取地址失败");
        }
    }
}

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

@@ -915,13 +915,17 @@ public class WeiXinEventProcess {
    public void setDoctorActivity(String doctor,List<Map<String, String>> articles,Properties systemConf){
        Doctor d = doctorDao.findByCode(doctor);
        if(d!=null&&StringUtils.isNotBlank(d.getActivityPath())){
            logger.info("setDoctorActivity:"+d.getActivityPath());
            String url = systemDictDao.findByDictName("DOCTOR_ACTIVITY_PATH").get(0).getCode();
            url = url.replace("{server}", wechat_base_url)
                    .replace("{appId}", appId)
                    .replace("{data}",doctor);
            logger.info("setDoctorActivity:"+url);
            // 图文消息图片URL
            String activityPath = systemConf.getProperty("doctor_activity_url");
            activityPath = activityPath.replace("{server}", serverUrl);
            Map<String, String> articleConsult = new HashMap<>();
            articleConsult.put("Url", d.getActivityPath());
            articleConsult.put("Url", url);
            articleConsult.put("Title", "家庭医生签约，红包来助力");
            articleConsult.put("Description", "数量有限，先到先得");
            articleConsult.put("PicUrl", activityPath);