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

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

@@ -175,13 +175,14 @@ public class PushMsgTask {
    /**
     * 发送微信模板消息
     *
     * @param type 1：签约成功  2：签约失败  3：咨询回复通知  4：健康指导提醒  5：解约申请通知  6：预约挂号成功通知  7：预约取消通知 8 缴费提醒
     * @param type 1：签约成功  2：签约失败  3：咨询回复通知  4：健康指导提醒  5：解约申请通知  6：预约挂号成功通知  7：预约取消通知 8 缴费提醒 9 健康教育
     * @param json 当type==1||type==2时：{"first":"消息主题",”doctor":"医生code","doctorName":"医生名","date":"签约时间","content":"签约内容","remark":"消息备注"}
     *             type==3时：{"first":"消息主题","consult":"医生咨询编号","consultcontent":"咨询内容","replycontent":"回复内容","doctorName":"医生名","remark":"消息备注"}
     *             type==4时：{"first":"消息主题","date":"指导时间","orgName":"指导机构","doctorName":"指导医生名","content":"指导内容","remark":"消息备注"}
     *             type==5时：{"first":"消息主题","date":"解约时间",”doctor":"医生code","doctorName":"医生名","orgName":"解约机构","remark":"消息备注"}
     *             type==6时：{"first":"消息主题","date":"预约时间",”id":"预约ID","doctorName":"医生名","orgName":"预约医院","deptName":"预约科室","remark":"消息备注"}
     *             type==7时：{"first":"消息主题","name":"就诊人名","date":"预约时间","doctorName":"医生名","orgName":"预约医院","remark":"消息备注"}
     *             type==9时：{"first":"消息主题","name":"患教标题","doctorName":"医生名","date":"发送时间","remark":"消息备注"}
     * @return
     */
    private boolean sendWeixinMessage(String access_token, int type, String openid, String name, JSONObject json) {
@@ -380,6 +381,30 @@ public class PushMsgTask {
                keyword4.setColor("#000000");
                keyword4.setValue(json.getString("content"));
                m.put("remark", keyword4);
            }else if (type == 9) {
                temp.setUrl(url + "jkjy/html/article.html?openid=" + openid + "&dataId=" + json.getString("article"));
                temp_id = SystemConf.getInstance().getSystemProperties().getProperty("template_healthy_article");
                temp.setTemplate_id(temp_id);
                WechatTemplateData keyword1 = new WechatTemplateData();
                keyword1.setColor("#000000");
                keyword1.setValue(json.getString("first"));
                m.put("first", keyword1);
                WechatTemplateData keyword2 = new WechatTemplateData();
                keyword2.setColor("#000000");
                keyword2.setValue(json.getString("title"));
                m.put("keyword1", keyword2);
                WechatTemplateData keyword3 = new WechatTemplateData();
                keyword3.setColor("#000000");
                keyword3.setValue(json.getString("doctorName"));
                m.put("keyword2", keyword3);
                WechatTemplateData keyword4 = new WechatTemplateData();
                keyword4.setColor("#000000");
                keyword4.setValue(json.getString("date"));
                m.put("keyword3", keyword4);
                WechatTemplateData keyword5 = new WechatTemplateData();
                keyword5.setColor("#000000");
                keyword5.setValue(json.getString("remark"));
                m.put("remark", keyword5);
            }
            temp.setData(m);
            ObjectMapper mapper = new ObjectMapper();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -246,7 +246,7 @@ public class WechatController extends WeixinBaseController {
                case 0:
                    return error(-1, "验证码无效！");
            }
            // 未绑定openid，查询是否绑定其他帐号
            // 未绑定openid，查询是否绑定其他账号
//			if (patientService.countByOpenid(openid) > 0) {
//				return error(-1, "该微信号已绑定其他手机号！");
//			}
@@ -350,9 +350,9 @@ public class WechatController extends WeixinBaseController {
                loginLog.setLoginType("2");
                if (patient == null) {
                    if(mobile.length()==11){
                        errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                        errorMessage="该手机号暂未注册账号，请确认后重新输入！";
                    }else{
                        errorMessage="该身份证号暂未注册帐号，请确认后重新输入！";
                        errorMessage="该身份证号暂未注册账号，请确认后重新输入！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
@@ -367,7 +367,7 @@ public class WechatController extends WeixinBaseController {
                    loginLogService.saveLog(loginLog);
                    return error(-1,errorMessage );
                } else if (patient.getStatus() == 2) {
                    errorMessage="该帐号正在审核中，请确认审核通过后再登录，“如有疑问，拨打400-6677-400转2人工客服”";
                    errorMessage="该账号正在审核中，请确认审核通过后再登录，“如有疑问，拨打400-6677-400转2人工客服”";
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
@@ -439,9 +439,9 @@ public class WechatController extends WeixinBaseController {
                loginLog.setLoginType("1");
                if (patient == null) {
                    if(mobile.length()==11){
                        errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
                        errorMessage="该手机号暂未注册账号，请确认后重新输入！";
                    }else{
                        errorMessage="该身份证号暂未注册帐号，请确认后重新输入！";
                        errorMessage="该身份证号暂未注册账号，请确认后重新输入！";
                    }
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
@@ -456,7 +456,7 @@ public class WechatController extends WeixinBaseController {
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
                } else if (patient.getStatus() == 2) {
                    errorMessage="该帐号正在审核中，请确认审核通过后再登录，“如有疑问，拨打400-6677-400转2人工客服”";
                    errorMessage="该账号正在审核中，请确认审核通过后再登录，“如有疑问，拨打400-6677-400转2人工客服”";
                    loginLog.setErrorMessage(errorMessage);
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthEduArticleController.java

@@ -3,8 +3,11 @@ package com.yihu.wlyy.web.doctor.health;
import java.util.*;
import com.yihu.wlyy.entity.education.*;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.health.*;
import com.yihu.wlyy.service.app.label.SignPatientLabelInfoService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.htmlparser.Parser;
@@ -37,7 +40,7 @@ import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "健康教育")
public class DoctorHealthEduArticleController extends BaseController {
public class DoctorHealthEduArticleController extends WeixinBaseController {
	@Autowired
	private HealthEduArticleService healthEduArticleService;
@@ -57,6 +60,9 @@ public class DoctorHealthEduArticleController extends BaseController {
	@Autowired
	private HealthEduArticleLabelService healthEduArticleLabelService;
	@Autowired
	private PatientService patientService;
	/**
	 * 查询
	 * @param pagesize 分页大小
@@ -263,8 +269,11 @@ public class DoctorHealthEduArticleController extends BaseController {
			}
			// 查询医生信息
			Doctor doctor = doctorService.findDoctorByCode(getUID());
			String msgHead = doctor.getName()+"医生给您发来了一篇患教文章";
			String endMsg = "为了您的健康，"+doctor.getName()+"医生给您发送了一篇患教文章，请仔细查阅，如有问题，可随时咨询医生。";
			JSONArray messages = new JSONArray();
			for (String p : patientSet) {
				Patient patientTemp = patientService.findByCode(p);
				for (String a : articles) {
					// 查询文章信息
					HealthEduArticle temp = maps.get(a);
@@ -294,14 +303,18 @@ public class DoctorHealthEduArticleController extends BaseController {
					// 设置为示读
					heap.setRead(1);
					list.add(heap);
					if (StringUtils.isNotEmpty(patientTemp.getOpenid())) {
						// 推送消息给微信端
						JSONObject json = new JSONObject();
						json.put("first",msgHead);
						json.put("article",temp.getId()+"");
						json.put("title",temp.getTitle());
						json.put("doctorName",doctor.getName());
						json.put("date", DateUtil.dateToStrLong(DateUtil.getNowDate()));
						json.put("remark", endMsg);
						PushMsgTask.getInstance().putWxMsg(getAccessToken(), 9, patientTemp.getOpenid(), patientTemp.getName(), json);
					}
				}
				
				JSONObject message = new JSONObject();
				message.put("receiver", p);
				message.put("type", MessageType.MESSAGE_TYPE_PATIENT_HEALTH_EDU.P_HE_01.name());
				message.put("title", MessageType.MESSAGE_TYPE_PATIENT_HEALTH_EDU.健康教育.name());
				message.put("msg", MessageType.MESSAGE_TYPE_PATIENT_HEALTH_EDU.您有新的健康教育.name());
				messages.put(message);
			}
			// 保存到数据库
			int row = healthEduArticleService.send(list);
@@ -375,6 +388,7 @@ public class DoctorHealthEduArticleController extends BaseController {
	}
	private String parsrHtml(String html) {
		html =("<span>"+html+"</span>");//拼接一个HTML标签，防止纯文字字符串转换在linux下面出现的异常。
		Parser parser = null;
		try{
			parser = new Parser(html);
@@ -386,4 +400,7 @@ public class DoctorHealthEduArticleController extends BaseController {
		}
	}
	public static void main(String arg[]){
		System.out.println(MessageType.MESSAGE_TYPE_PATIENT_HEALTH_EDU.P_HE_01.name());
	}
}

patient-co-wlyy/src/main/resources/system.properties

@@ -136,6 +136,10 @@ template_appoint_success=Bo2yqNczSU9zkg4wXoouv9tSeefZ6TziggWL3dTXPYE
template_appoint_failed=pErTBTdweIdrNRf_1Oo62YtQC0aHwPvtLaCzw44JzCQ
#缴费提醒
template_expenses_remind=BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
#健康教育
template_healthy_article=LA7erINJ0CSsG2G_ZCrgsDaX3krhsI4qg_NSHEyL_l4
#----------------正式环境-----------------#
@@ -157,6 +161,8 @@ template_expenses_remind=BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
#template_appoint_failed=tldWEb9AN7p_RoHoD8ml0GxWW3V1V_mpEEhp2v6p56s
##缴费提醒
#template_expenses_remind=tldWEb9AN7p_RoHoD8ml0GxWW3V1V_mpEEhp2v6p56s
##健康教育
#template_healthy_article=a5-ZGf-IUUULsuRNoHWQiBMU6pSYhLgPPqV67SjdLRo
#----------------测试环境(健康之路i厦门)----------------#
##签约邀请
@@ -177,6 +183,8 @@ template_expenses_remind=BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
#template_appoint_failed=r-bVEKgXVyl8O96saoJXlLd7DX1zW7fXA4a0PZHxiQM
##缴费提醒
#template_expenses_remind=r-bVEKgXVyl8O96saoJXlLd7DX1zW7fXA4a0PZHxiQM
##健康教育
#template_healthy_article=aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
#----------------演示环境(健康之路i健康)-----------------#
##签约邀请