微信时间,模板详情

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamDao.java

@@ -95,4 +95,5 @@ public interface DoctorAdminTeamDao extends
    //  查询当前医生是否为团队长
    @Query("SELECT count(1) from AdminTeam t WHERE t.available = true  AND t.leaderCode = ?1 ")
    int findLeader(String leaderCode);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -609,7 +609,7 @@ public class FamilyMemberService extends BaseService {
    }
    public String getFamilyMesListSql(String code) {
        StringBuffer sql = new StringBuffer("SELECT t.*,p.idcard,p.mobile FROM wlyy_patient_family_temp t,wlyy_patient p WHERE t.patient = p.code AND t.dealer ='" + code+"'");
        StringBuffer sql = new StringBuffer("SELECT t.*,p.idcard,p.mobile,p.photo FROM wlyy_patient_family_temp t,wlyy_patient p WHERE t.patient = p.code AND t.dealer ='" + code+"'");
        return sql.toString();
    }

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

@@ -937,7 +937,7 @@ public class SignWebService extends BaseService {
                        + "我们将继续为您提供优质的健康服务。");
                if (StringUtils.isNotBlank(openid)) {
                    json.put("first", name + "，您好！\n" +
                            "您的家庭医生签约将于7月31日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                            "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                    PushMsgTask.getInstance().putWxMsg(access_token, 16, openid, name, json);
                } else {
                    //如果自己没有绑定,则发给家人
@@ -948,13 +948,13 @@ public class SignWebService extends BaseService {
                    if (StringUtils.isNotBlank(member.getOpenid())) {
                        json.put("first", weiXinOpenIdUtils.getTitleMes(p, (int) j.get("relation"), member.getName()) + "\n" +
                                name + "，您好！\n" +
                                "您的家庭医生签约将于7月31日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                                "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                        PushMsgTask.getInstance().putWxMsg(access_token, 16, member.getOpenid(), member.getName(), json);
                    } else {
                        //发送短信
                        String mobile = (String) signFamily.get("mobile");
                        if (StringUtils.isNotBlank(mobile)) {
                            SMSService.sendMsg(mobile, name + "您好！您的家庭医生将于7月31日到期，为了继续给您提供健康服务，请关注“厦门i健康”公众号，回复“续签”，进行家庭医生线上续签。");
                            SMSService.sendMsg(mobile, name + "您好！您的家庭医生将于6月30日到期，为了继续给您提供健康服务，请关注“厦门i健康”公众号，回复“续签”，进行家庭医生线上续签。");
                        }
                    }
                }
@@ -1278,7 +1278,7 @@ public class SignWebService extends BaseService {
        if (StringUtils.isNotBlank(openid)) {
            json.put("first", name + "，您好！\n" +
                    "您的家庭医生签约将于7月31日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                    "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
            PushMsgTask.getInstance().putWxMsg(access_token, 16, openid, name, json);
            patientSetReminFlag(patientCode);
            return 1;
@@ -1289,7 +1289,7 @@ public class SignWebService extends BaseService {
            if (StringUtils.isNotBlank(member.getOpenid())) {
                json.put("first", weiXinOpenIdUtils.getTitleMes(p, (int) j.get("relation"), member.getName()) + "\n" +
                        name + "，您好！\n" +
                        "您的家庭医生签约将于7月31日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                        "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。");
                PushMsgTask.getInstance().putWxMsg(access_token, 16, member.getOpenid(), member.getName(), json);
                patientSetReminFlag(patientCode);
                return 1;
@@ -1297,7 +1297,7 @@ public class SignWebService extends BaseService {
                //发送短信
                String mobile = p.getMobile();
                if (StringUtils.isNotBlank(mobile)) {
                    SMSService.sendMsg(mobile, name + "您好！您的家庭医生将于7月31日到期，为了继续给您提供健康服务，请关注“厦门i健康”公众号，回复“续签”，进行家庭医生线上续签。");
                    SMSService.sendMsg(mobile, name + "您好！您的家庭医生将于6月30日到期，为了继续给您提供健康服务，请关注“厦门i健康”公众号，回复“续签”，进行家庭医生线上续签。");
                    patientSetReminFlag(patientCode);
                    return 2;
                }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1706,4 +1706,44 @@ public class StatisticsService extends BaseService {
        }
        return rs;
    }
    /**
     * 统计当前团队,签约人数,服务次数,平均满意度
     * @param type 0.当前周;1.当前月
     * @return
     */
    public JSONArray getStatTitleInfo(String doctor,String type){
        AdminTeam admin =  adminTeamDao.findByLeaderCode(doctor);
        Long id = admin.getId();
        String startDate = "";
        String endDate = "";
        if(StringUtils.isNotBlank(type)){
            //默认查周
            if("0".equals(type)){
                startDate = DateUtil.getMondayOfThisWeek()+" 00:00:00";
                endDate = DateUtil.getSundayOfThisWeek()+" 23:59:59";
            }else {
                startDate = DateUtil.getFristDayOfMonth() +" 00:00:00";
                endDate = DateUtil.getLastDayOfMonth()+" 23:59:59";
            }
        }
        //查找团队签约
        String sign_sql = "";
        return null;
//        //咨询量
//        String consult_sql = "SELECT COUNT(1) AS consultCount,d.name doctorName FROM wlyy_consult_team t,wlyy_doctor d WHERE t.doctor = d.code AND t.patient ='" + 次数,patient平均满意度 + "' " +
//                "AND t.czrq <= ? AND t.czrq >='" + (year - 1) + "-07-01' GROUP BY t.doctor DESC ";
//        //获取待预约
//        String reservation_sql = "SELECT COUNT(1) AS reservationCount FROM wlyy_patient_reservation  w " +
//                " WHERE w.doctor in(" + doctorCodeSql + ") AND w.patient ='" + patient + "'" +
//                " AND w.czrq <='" + year + "-07-01' AND w.czrq >='" + (year - 1) + "-07-01'  ";
//        //获取健康教育
//        String article_sql = "SELECT COUNT(1) AS articleCount FROM wlyy_health_edu_article_patient  w,wlyy_health_edu_article w2 WHERE w.article = w2.code " +
//                "AND  w.doctor IN(" + doctorCodeSql + ") AND w.patient ='" + patient + "' " +
//                "AND w.czrq <='" + year + "-07-01' AND w.czrq >='" + (year - 1) + "-07-01'  ";
//        //获取健康指导
//        String guidance_sql = "SELECT COUNT(1) AS guidanceCount  FROM wlyy_patient_health_guidance  w " +
//                "WHERE w.doctor IN(" + doctorCodeSql + ") and w.patient ='" + patient + "' AND w.czrq <='" + year + "-07-01' AND w.czrq >='" + (year - 1) + "-07-01'  ";
    }
}

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

@@ -527,7 +527,7 @@ public class PushMsgTask {
                keyword1.setValue(json.getString("keyword1"));
                m.put("keyword1", keyword1);
            } else if (type == 16) {
                //temp.setUrl(url + "yszx/html/consulting-doctor.html?openid=" + openid + "&consult=" + json.getString("consult") + "&toUser=" + json.getString("toUser") + "&toName=" + name);
                temp.setUrl(url + "xuqian/html/information.html?openid=" + openid);
                temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
                WechatTemplateData keyword1 = new WechatTemplateData();
                keyword1.setColor("#000000");

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

@@ -765,4 +765,57 @@ public class DateUtil {
		Calendar cal = Calendar.getInstance();
		return cal.get(Calendar.YEAR);
	}
	/**
	 * 获取周一
	 * @return
     */
	public static String getMondayOfThisWeek() {
		SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd");
		Calendar c = Calendar.getInstance();
		int day_of_week = c.get(Calendar.DAY_OF_WEEK) - 1;
		if (day_of_week == 0)
			day_of_week = 7;
		c.add(Calendar.DATE, -day_of_week + 1);
		return df2.format(c.getTime());
	}
	/**
	 * 得到本周周日
	 *
	 * @return yyyy-MM-dd
	 */
	public static String getSundayOfThisWeek() {
		SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd");
		Calendar c = Calendar.getInstance();
		int day_of_week = c.get(Calendar.DAY_OF_WEEK) - 1;
		if (day_of_week == 0)
			day_of_week = 7;
		c.add(Calendar.DATE, -day_of_week + 7);
		return df2.format(c.getTime());
	}
	/**
	 * 获取当月第一天
	 * @return
     */
	public static String getFristDayOfMonth() {
		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
		// 获取前月的第一天
		Calendar c = Calendar.getInstance();
		c.add(Calendar.MONTH, 0);
		c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
		String first = format.format(c.getTime());
		return format.format(c.getTime());
	}
	/**
	 * 获取当月最后一天
	 */
	public static String getLastDayOfMonth(){
		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
		// 获取前月的第一天
		Calendar ca = Calendar.getInstance();
		ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
		return format.format(ca.getTime());
	}
}

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

@@ -517,7 +517,7 @@ public class WeiXinEventProcess {
     */
    public static String replyKeyword(Map<String, String> message) throws Exception {
        String result = "";
        String description = "您的家庭医生签约将于7月31日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。";
        String description = "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。";
        String description1 = "为了能给您提供健康服务，诚邀您签签约家庭医生。";
        // 图文信息
        List<Map<String, String>> articles = new ArrayList<>();