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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -215,7 +215,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
            if (record != null) {
                if (record.getTimes() < 3 && record.getTimes() > 0) {
//                    每次间隔2天发送(已发送过1-2次)
                    if (DateUtil.getDays(new Date(), record.getSendTime()) == 3) {
                    if (DateUtil.getDutyDays(record.getSendTime(),new Date()) == 4) {
                        record.setTimes(record.getTimes() + 1);
                    }else {
                        return;

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -595,6 +595,23 @@ public class DateUtil {
		return new SimpleDateFormat("yyyy-MM-dd").format(c.getTime());
	}
	/**
	 * 获取2个时间点的工作日天数
	 * @param startDate 开始时间
	 * @param endDate 结束时间
	 * @return
	 */
	public static int getDutyDays(Date startDate, Date endDate) {
		int result = 0;
		while (startDate.compareTo(endDate) <= 0) {
			if (startDate.getDay() != 6 && startDate.getDay() != 0) {
				result++;
			}
			startDate.setDate(startDate.getDate() + 1);
		}
		return result;
	}
	/**
	 * 根据一个日期，返回是星期几的字符串
	 * 

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/ylz/ThirdMessageService.java

@@ -50,6 +50,8 @@ public class ThirdMessageService extends BaseService {
                response.put("ret_msg", "messageContent参数不能为空！");
                return response;
            }
//            区分外部接口跳转链接
            messageContent.put("wlyygc","1");
            switch (type) {
                case 0:
                    pushMsgTask.putWxMsg(accessTokenUtils.getAccessToken(), 18, openId, name, messageContent);

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

@@ -634,7 +634,11 @@ public class PushMsgTask {
                keyword2.setValue(json.getString("keyword2"));
                m.put("keyword2", keyword2);
            } else if (type == 18) {
                temp.setUrl(url + json.getString("url"));
                if (json.has("wlyygc")) {
                    temp.setUrl(json.getString("url"));
                }else {
                    temp.setUrl(url + json.getString("url"));
                }
                temp.setTemplate_id(template_doctor_survey);
                WechatTemplateData keyword1 = new WechatTemplateData();
                keyword1.setColor("#000000");