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

common/common-entity/src/main/java/com/yihu/wlyy/entity/wechat/WechatTemplateConfig.java

@@ -14,7 +14,7 @@ import javax.persistence.Table;
@Table(name = "weixin_template_config")
public class WechatTemplateConfig extends IdEntity {
	private static final long serialVersionUID = -7399054549159698617L;
	private String templateId; //'模板ID
	private String templateName;//'自定义模板名称'
    private String scene;//使用场景值
    private String sceneDescription;//'使用场景描述'
    private String first;
@@ -33,12 +33,12 @@ public class WechatTemplateConfig extends IdEntity {
        return serialVersionUID;
    }
    public String getTemplateId() {
        return templateId;
    public String getTemplateName() {
        return templateName;
    }
    public void setTemplateId(String templateId) {
        this.templateId = templateId;
    public void setTemplateName(String templateName) {
        this.templateName = templateName;
    }
    public String getScene() {

common/common-entity/src/main/java/com/yihu/wlyy/entity/wechat/WeixinTemplate.java

@@ -16,7 +16,7 @@ public class WeixinTemplate  extends IdEntity {
    private String accId;//'微信公众号原始ID'
    private String templateName;//'自定义模板名称'
    private String templateId;//'模板ID'
    private String templateTitle;//'模板标题'
    private Integer type;//'自定义模板类型'
    private String format;//'模板内容格式'
    private Integer status;//'模板状态 1:正常  0:删除'
@@ -37,12 +37,12 @@ public class WeixinTemplate  extends IdEntity {
        this.templateName = templateName;
    }
    public String getTemplateId() {
        return templateId;
    public String getTemplateTitle() {
        return templateTitle;
    }
    public void setTemplateId(String templateId) {
        this.templateId = templateId;
    public void setTemplateTitle(String templateTitle) {
        this.templateTitle = templateTitle;
    }
    public Integer getType() {

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

@@ -50,6 +50,8 @@ public class PushMsgTask {
    private String template_schedule_remind;
    @Value("${wechat.message.template_service_remind}")
    private String template_service_remind;
    @Value("${wechat.message.template_callserver_remind}")
    private String template_callserver_remind;
    @Value("${pushMes.method}")
    private String putMesMethod;
    @Value("${pushMes.redis_prescription_title}")
@@ -335,6 +337,9 @@ public class PushMsgTask {
            case 10:
                templateId = template_service_remind;
                break;
            case 11:
                templateId = template_callserver_remind;
                break;
        }
        return templateId;
    }

patient-co/patient-co-doctor-assistant/src/main/resources/application-dev.yml

@@ -30,7 +30,7 @@ wechat:
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_aa9cd602b84b
  accId: gh_b0f086d0d2f5
  message:
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik

patient-co/patient-co-doctor-assistant/src/main/resources/application-devtest.yml

@@ -30,7 +30,7 @@ wechat:
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fassistant
  accId: gh_aa9cd602b84b
  accId: gh_b0f086d0d2f5
  message:
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik

patient-co/patient-co-doctor-assistant/src/main/resources/application-local.yml

@@ -30,7 +30,7 @@ wechat:
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_aa9cd602b84b
  accId: gh_b0f086d0d2f5
  message:
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik

patient-co/patient-co-doctor-assistant/src/main/resources/application-localtest.yml

@@ -30,7 +30,7 @@ wechat:
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_aa9cd602b84b
  accId: gh_b0f086d0d2f5
  message:
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik

patient-co/patient-co-doctor-assistant/src/main/resources/application-test.yml

@@ -29,7 +29,7 @@ wechat:
  appSecret: c5bdedd909ded9c2ee08028487e6f50d
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fassistant
  accId: gh_aa9cd602b84b
  accId: gh_b0f086d0d2f5
  message:
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik

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

@@ -143,6 +143,7 @@ public class PatientConfirmReceiptJob implements Job {
            }
            logger.info("sendJson: " + sendJson);
        }else if (type == 2) {
            String url = "prescription/html/order_tracking.html?represented="+patient;
            String first = name + "您好,您的续方订单已自动确认收药";
            String remark = "如果您未收到续方药品，请及时与社区药房工作人员联系。";
            sendJson.put("keyword1", name);
@@ -150,6 +151,7 @@ public class PatientConfirmReceiptJob implements Job {
            sendJson.put("keyword3", "续方订单状态");
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url+ "&openid=" + openId +"&toUser=" + patient + "&toName=" +name);//带参数的模板跳转链接
            sendJson.put("toUser", patient);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, openId, name, sendJson);
            //发送代理人
@@ -161,6 +163,7 @@ public class PatientConfirmReceiptJob implements Job {
                        Patient member = (Patient) j.get("member");
                        JSONObject newJson =  new JSONObject();
                        newJson.put("toUser", member.getCode());//带参数的模板跳转链接
                        newJson.put("url", url+ "&openid=" + member.getOpenid() +"&toUser=" + member.getCode() + "&toName=" +name);
                        //name患者姓名
                        newJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                        pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, member.getOpenid(), name, newJson);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/wechat/WechatTemplateConfigDao.java

@@ -12,7 +12,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface WechatTemplateConfigDao extends PagingAndSortingRepository<WechatTemplateConfig, Long>, JpaSpecificationExecutor<WechatTemplateConfig> {
    //根据模板id、场景值查询有效模板内容
    @Query("select t  from WechatTemplateConfig t where t.templateId=?1 and t.scene=?2 and t.status = 1 ")
    WechatTemplateConfig findByScene(String templateId,String scene);
    //根据自定义模板名称、场景值查询有效模板内容
    @Query("select t  from WechatTemplateConfig t where t.templateName=?1 and t.scene=?2 and t.status = 1 ")
    WechatTemplateConfig findByScene(String templateName,String scene);
}