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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionPay.java

@@ -14,15 +14,45 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_prescription_pay")
public class PrescriptionPay extends IdEntity {
    private String code;//业务code
    private String payNum;//支付流水号
    private String prescriptionCode;//续方code
    private Date createTime;//创建时间
    private String ybCard;//医保卡号
    private Integer type;// 1 医保支付
    private Integer status;//状态  成功1 失败0
    private Double ybCost;//医保费用
    private Double myCost;//自己付费
    private String code;//接入应用业务流水号outChargeNo
    private String prescriptionCode;//开处方的医生code 关联 wlyy_prescription
    private Integer type;//1 医保支付
    private Date outChargeTime;//接入应用时间
    private String channel;//支付方式
    private String chargeNo;//支付平台流水号
    private Date chargeTime;//支付平台交易成功时间
    private String billNo;//待结算费用单据号
    private String cardNo;//医保卡号
    private Integer totalAmount;//交易总金额
    private Integer insuranceAmount;//医保支付金额
    private Integer selfPayAmount;//自付金额
    private String openid;//用户openID
    private String userName;//用户名字
    private String idType;//证件类型
    private String idNo;//证件号码
    private String tradeStatus;//交易状态
    private String miSettleNo;//医保收费单据号
    private String miRegisterNo;//医保挂号
    private Date miCollectDate;//收费日期
    private Date miCollectTime;//收费时间
    private String miCollectorName;//收费人姓名
    private Integer miTotalFee;//本次报销总额
    private Integer selfPay;//个人现金支付
    private Integer accountPay;//个人账户支付
    private Integer heathPay;//健康账户支付
    private Integer cadresPay;//公务员补助
    private Integer fundPay;//基金支付
    private Integer healthCarePay;//保健基金支付
    private Integer commercePay;//商业保险支付
    private Integer familyPay;//共济账户支付
    private Integer civilPay;//民政补助金额
    private String civilZone;//民政行政区号
    private Integer bdrugPay;//乙类支付金额
    private Integer unlessAmount;//非医保费用
    private Integer exceedAmount;//超封顶线金额
    private Date createTime;//续方确认支付时间
    private Date czrq;//续方记录最后操作时间
    public String getCode() {
        return code;
@@ -32,14 +62,6 @@ public class PrescriptionPay extends IdEntity {
        this.code = code;
    }
    public String getPayNum() {
        return payNum;
    }
    public void setPayNum(String payNum) {
        this.payNum = payNum;
    }
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
@@ -48,52 +70,299 @@ public class PrescriptionPay extends IdEntity {
        this.prescriptionCode = prescriptionCode;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    public Date getOutChargeTime() {
        return outChargeTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setOutChargeTime(Date outChargeTime) {
        this.outChargeTime = outChargeTime;
    }
    public String getYbCard() {
        return ybCard;
    public String getChannel() {
        return channel;
    }
    public void setYbCard(String ybCard) {
        this.ybCard = ybCard;
    public void setChannel(String channel) {
        this.channel = channel;
    }
    public Integer getType() {
        return type;
    public String getChargeNo() {
        return chargeNo;
    }
    public void setType(Integer type) {
        this.type = type;
    public void setChargeNo(String chargeNo) {
        this.chargeNo = chargeNo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getChargeTime() {
        return chargeTime;
    }
    public void setChargeTime(Date chargeTime) {
        this.chargeTime = chargeTime;
    }
    public String getBillNo() {
        return billNo;
    }
    public void setBillNo(String billNo) {
        this.billNo = billNo;
    }
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public Integer getTotalAmount() {
        return totalAmount;
    }
    public void setTotalAmount(Integer totalAmount) {
        this.totalAmount = totalAmount;
    }
    public Integer getInsuranceAmount() {
        return insuranceAmount;
    }
    public void setInsuranceAmount(Integer insuranceAmount) {
        this.insuranceAmount = insuranceAmount;
    }
    public Integer getSelfPayAmount() {
        return selfPayAmount;
    }
    public void setSelfPayAmount(Integer selfPayAmount) {
        this.selfPayAmount = selfPayAmount;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getIdType() {
        return idType;
    }
    public void setIdType(String idType) {
        this.idType = idType;
    }
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    public String getTradeStatus() {
        return tradeStatus;
    }
    public void setTradeStatus(String tradeStatus) {
        this.tradeStatus = tradeStatus;
    }
    public String getMiSettleNo() {
        return miSettleNo;
    }
    public void setMiSettleNo(String miSettleNo) {
        this.miSettleNo = miSettleNo;
    }
    public String getMiRegisterNo() {
        return miRegisterNo;
    }
    public void setMiRegisterNo(String miRegisterNo) {
        this.miRegisterNo = miRegisterNo;
    }
    public Integer getStatus() {
        return status;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getMiCollectDate() {
        return miCollectDate;
    }
    public void setMiCollectDate(Date miCollectDate) {
        this.miCollectDate = miCollectDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getMiCollectTime() {
        return miCollectTime;
    }
    public void setMiCollectTime(Date miCollectTime) {
        this.miCollectTime = miCollectTime;
    }
    public String getMiCollectorName() {
        return miCollectorName;
    }
    public void setMiCollectorName(String miCollectorName) {
        this.miCollectorName = miCollectorName;
    }
    public Integer getMiTotalFee() {
        return miTotalFee;
    }
    public void setMiTotalFee(Integer miTotalFee) {
        this.miTotalFee = miTotalFee;
    }
    public Integer getSelfPay() {
        return selfPay;
    }
    public void setSelfPay(Integer selfPay) {
        this.selfPay = selfPay;
    }
    public Integer getAccountPay() {
        return accountPay;
    }
    public void setAccountPay(Integer accountPay) {
        this.accountPay = accountPay;
    }
    public Integer getHeathPay() {
        return heathPay;
    }
    public void setHeathPay(Integer heathPay) {
        this.heathPay = heathPay;
    }
    public Integer getCadresPay() {
        return cadresPay;
    }
    public void setCadresPay(Integer cadresPay) {
        this.cadresPay = cadresPay;
    }
    public Integer getFundPay() {
        return fundPay;
    }
    public void setFundPay(Integer fundPay) {
        this.fundPay = fundPay;
    }
    public Integer getHealthCarePay() {
        return healthCarePay;
    }
    public void setHealthCarePay(Integer healthCarePay) {
        this.healthCarePay = healthCarePay;
    }
    public Integer getCommercePay() {
        return commercePay;
    }
    public void setCommercePay(Integer commercePay) {
        this.commercePay = commercePay;
    }
    public Integer getFamilyPay() {
        return familyPay;
    }
    public void setFamilyPay(Integer familyPay) {
        this.familyPay = familyPay;
    }
    public Integer getCivilPay() {
        return civilPay;
    }
    public void setCivilPay(Integer civilPay) {
        this.civilPay = civilPay;
    }
    public String getCivilZone() {
        return civilZone;
    }
    public void setCivilZone(String civilZone) {
        this.civilZone = civilZone;
    }
    public void setStatus(Integer status) {
        this.status = status;
    public Integer getBdrugPay() {
        return bdrugPay;
    }
    public Double getYbCost() {
        return ybCost;
    public void setBdrugPay(Integer bdrugPay) {
        this.bdrugPay = bdrugPay;
    }
    public void setYbCost(Double ybCost) {
        this.ybCost = ybCost;
    public Integer getUnlessAmount() {
        return unlessAmount;
    }
    public Double getMyCost() {
        return myCost;
    public void setUnlessAmount(Integer unlessAmount) {
        this.unlessAmount = unlessAmount;
    }
    public void setMyCost(Double myCost) {
        this.myCost = myCost;
    public Integer getExceedAmount() {
        return exceedAmount;
    }
    public void setExceedAmount(Integer exceedAmount) {
        this.exceedAmount = exceedAmount;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionPay.java

@@ -14,15 +14,45 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_prescription_pay")
public class PrescriptionPay extends IdEntity {
    private String code;//业务code
    private String payNum;//支付流水号
    private String prescriptionCode;//续方code
    private Date createTime;//创建时间
    private String ybCard;//医保卡号
    private Integer type;// 1 医保支付
    private Integer status;//状态  成功1 失败0
    private Integer ybCost;//统筹金额  单位分
    private Integer myCost;//自费金额  单位分
    private String code;//接入应用业务流水号outChargeNo
    private String prescriptionCode;//开处方的医生code 关联 wlyy_prescription
    private Integer type;//1 医保支付
    private Date outChargeTime;//接入应用时间
    private String channel;//支付方式
    private String chargeNo;//支付平台流水号
    private Date chargeTime;//支付平台交易成功时间
    private String billNo;//待结算费用单据号
    private String cardNo;//医保卡号
    private Integer totalAmount;//交易总金额
    private Integer insuranceAmount;//医保支付金额
    private Integer selfPayAmount;//自付金额
    private String openid;//用户openID
    private String userName;//用户名字
    private String idType;//证件类型
    private String idNo;//证件号码
    private String tradeStatus;//交易状态
    private String miSettleNo;//医保收费单据号
    private String miRegisterNo;//医保挂号
    private Date miCollectDate;//收费日期
    private Date miCollectTime;//收费时间
    private String miCollectorName;//收费人姓名
    private Integer miTotalFee;//本次报销总额
    private Integer selfPay;//个人现金支付
    private Integer accountPay;//个人账户支付
    private Integer heathPay;//健康账户支付
    private Integer cadresPay;//公务员补助
    private Integer fundPay;//基金支付
    private Integer healthCarePay;//保健基金支付
    private Integer commercePay;//商业保险支付
    private Integer familyPay;//共济账户支付
    private Integer civilPay;//民政补助金额
    private String civilZone;//民政行政区号
    private Integer bdrugPay;//乙类支付金额
    private Integer unlessAmount;//非医保费用
    private Integer exceedAmount;//超封顶线金额
    private Date createTime;//续方确认支付时间
    private Date czrq;//续方记录最后操作时间
    public String getCode() {
        return code;
@@ -32,14 +62,6 @@ public class PrescriptionPay extends IdEntity {
        this.code = code;
    }
    public String getPayNum() {
        return payNum;
    }
    public void setPayNum(String payNum) {
        this.payNum = payNum;
    }
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
@@ -48,52 +70,297 @@ public class PrescriptionPay extends IdEntity {
        this.prescriptionCode = prescriptionCode;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    public Date getOutChargeTime() {
        return outChargeTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setOutChargeTime(Date outChargeTime) {
        this.outChargeTime = outChargeTime;
    }
    public String getYbCard() {
        return ybCard;
    public String getChannel() {
        return channel;
    }
    public void setYbCard(String ybCard) {
        this.ybCard = ybCard;
    public void setChannel(String channel) {
        this.channel = channel;
    }
    public Integer getType() {
        return type;
    public String getChargeNo() {
        return chargeNo;
    }
    public void setType(Integer type) {
        this.type = type;
    public void setChargeNo(String chargeNo) {
        this.chargeNo = chargeNo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getChargeTime() {
        return chargeTime;
    }
    public void setChargeTime(Date chargeTime) {
        this.chargeTime = chargeTime;
    }
    public String getBillNo() {
        return billNo;
    }
    public void setBillNo(String billNo) {
        this.billNo = billNo;
    }
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public Integer getTotalAmount() {
        return totalAmount;
    }
    public void setTotalAmount(Integer totalAmount) {
        this.totalAmount = totalAmount;
    }
    public Integer getInsuranceAmount() {
        return insuranceAmount;
    }
    public void setInsuranceAmount(Integer insuranceAmount) {
        this.insuranceAmount = insuranceAmount;
    }
    public Integer getSelfPayAmount() {
        return selfPayAmount;
    }
    public void setSelfPayAmount(Integer selfPayAmount) {
        this.selfPayAmount = selfPayAmount;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getIdType() {
        return idType;
    }
    public void setIdType(String idType) {
        this.idType = idType;
    }
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    public String getTradeStatus() {
        return tradeStatus;
    }
    public void setTradeStatus(String tradeStatus) {
        this.tradeStatus = tradeStatus;
    }
    public String getMiSettleNo() {
        return miSettleNo;
    }
    public void setMiSettleNo(String miSettleNo) {
        this.miSettleNo = miSettleNo;
    }
    public String getMiRegisterNo() {
        return miRegisterNo;
    }
    public void setMiRegisterNo(String miRegisterNo) {
        this.miRegisterNo = miRegisterNo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getMiCollectDate() {
        return miCollectDate;
    }
    public void setMiCollectDate(Date miCollectDate) {
        this.miCollectDate = miCollectDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getMiCollectTime() {
        return miCollectTime;
    }
    public void setMiCollectTime(Date miCollectTime) {
        this.miCollectTime = miCollectTime;
    }
    public String getMiCollectorName() {
        return miCollectorName;
    }
    public void setMiCollectorName(String miCollectorName) {
        this.miCollectorName = miCollectorName;
    }
    public Integer getMiTotalFee() {
        return miTotalFee;
    }
    public void setMiTotalFee(Integer miTotalFee) {
        this.miTotalFee = miTotalFee;
    }
    public Integer getSelfPay() {
        return selfPay;
    }
    public void setSelfPay(Integer selfPay) {
        this.selfPay = selfPay;
    }
    public Integer getAccountPay() {
        return accountPay;
    }
    public void setAccountPay(Integer accountPay) {
        this.accountPay = accountPay;
    }
    public Integer getHeathPay() {
        return heathPay;
    }
    public void setHeathPay(Integer heathPay) {
        this.heathPay = heathPay;
    }
    public Integer getCadresPay() {
        return cadresPay;
    }
    public void setCadresPay(Integer cadresPay) {
        this.cadresPay = cadresPay;
    }
    public Integer getFundPay() {
        return fundPay;
    }
    public Integer getStatus() {
        return status;
    public void setFundPay(Integer fundPay) {
        this.fundPay = fundPay;
    }
    public void setStatus(Integer status) {
        this.status = status;
    public Integer getHealthCarePay() {
        return healthCarePay;
    }
    public Integer getYbCost() {
        return ybCost;
    public void setHealthCarePay(Integer healthCarePay) {
        this.healthCarePay = healthCarePay;
    }
    public void setYbCost(Integer ybCost) {
        this.ybCost = ybCost;
    public Integer getCommercePay() {
        return commercePay;
    }
    public Integer getMyCost() {
        return myCost;
    public void setCommercePay(Integer commercePay) {
        this.commercePay = commercePay;
    }
    public Integer getFamilyPay() {
        return familyPay;
    }
    public void setFamilyPay(Integer familyPay) {
        this.familyPay = familyPay;
    }
    public Integer getCivilPay() {
        return civilPay;
    }
    public void setCivilPay(Integer civilPay) {
        this.civilPay = civilPay;
    }
    public String getCivilZone() {
        return civilZone;
    }
    public void setCivilZone(String civilZone) {
        this.civilZone = civilZone;
    }
    public Integer getBdrugPay() {
        return bdrugPay;
    }
    public void setBdrugPay(Integer bdrugPay) {
        this.bdrugPay = bdrugPay;
    }
    public Integer getUnlessAmount() {
        return unlessAmount;
    }
    public void setUnlessAmount(Integer unlessAmount) {
        this.unlessAmount = unlessAmount;
    }
    public Integer getExceedAmount() {
        return exceedAmount;
    }
    public void setExceedAmount(Integer exceedAmount) {
        this.exceedAmount = exceedAmount;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setMyCost(Integer myCost) {
        this.myCost = myCost;
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/prescription/PrescriptionPayDao.java

@@ -12,6 +12,6 @@ import java.util.List;
 * Created by chenweida on 2017/7/27.
 */
public interface PrescriptionPayDao extends PagingAndSortingRepository<PrescriptionPay, Long>, JpaSpecificationExecutor<PrescriptionPay> {
    @Query("from PrescriptionPay p where p.prescriptionCode=?1 and p.status=1")
    @Query("from PrescriptionPay p where p.prescriptionCode=?1 and p.tradeStatus=1")
    PrescriptionPay findByPrescriptionPay(String prescriptionCode);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionNoticesService.java

@@ -34,22 +34,17 @@ public class PrescriptionNoticesService extends BaseService {
     * 发送续方相关模板消息
     *
     * @param accessToken
     * @param doctor      医生code
     * @param patient     居民code
     * @param openId      要发送对象居民的微信openID
     * @param name        要发送对象居民姓名
     * @param doctName    相关医生姓名（type=1审核医生、type=2 null、type=3配送健管师、type=4审核医生）
     * @param ordenTime   订单完成时间（type=1 null、type=2 null、type=3 null、type=4 订单完成时间）
     * @param type        1:续方审核通知 2：取药代办通知 3：配送中信息变更 4：已完成服务结果
     * @param status      续方通知状态 0不通过 1通过 2调整处方  其余状态均为0
     * @param url         带参数的模板跳转链接
     */
    public void sendMessages(String accessToken, String doctor, String patient, String checkDoctor,String ordenTime,int type, int status) throws Exception{
    public void sendMessages(String accessToken, String openId, String name, String doctName, String ordenTime, int type, int status, String url) throws Exception {
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Doctor doct = doctorDao.findByCode(doctor);
        Patient people = patientDao.findByCode(patient);
        if (StringUtil.isEmpty(people.getOpenid())){
            return;
        }
        String doctName = doct.getName();
        String name = people.getName();
        String openId = people.getOpenid();
        JSONObject sendJson = new JSONObject();
        String first = "";
        String remark = "";
@@ -57,12 +52,13 @@ public class PrescriptionNoticesService extends BaseService {
        if (type == 1) {
            switch (status) {
                case 0:
                    first =  name+ "您好，你的续方申请医生已审核。";
                    first = name + "您好，你的续方申请医生已审核。";
                    remark = "您可点击消息查看详情，修改续方信息后重新提交。";
                    sendJson.put("keyword1", "审核不通过");
                    sendJson.put("keyword2", doctName);
                    sendJson.put("first", first);
                    sendJson.put("remark", remark);
                    sendJson.put("url", url);//带参数的模板跳转链接
                    pushMsgTask.putWxMsg(accessToken, 19, openId, name, sendJson);
                    break;
                case 1:
@@ -72,6 +68,7 @@ public class PrescriptionNoticesService extends BaseService {
                    sendJson.put("keyword2", doctName);
                    sendJson.put("first", first);
                    sendJson.put("remark", remark);
                    sendJson.put("url", url);//带参数的模板跳转链接
                    pushMsgTask.putWxMsg(accessToken, 19, openId, name, sendJson);
                    break;
                case 2:
@@ -81,36 +78,40 @@ public class PrescriptionNoticesService extends BaseService {
                    sendJson.put("keyword2", doctName);
                    sendJson.put("first", first);
                    sendJson.put("remark", remark);
                    sendJson.put("url", url);//带参数的模板跳转链接
                    pushMsgTask.putWxMsg(accessToken, 19, openId, name, sendJson);
                    break;
            }
        } else if (type == 2) {
            first =  name+ "您好，您的续方订单已完成配药，请尽快致社区医院取药。";
            first = name + "您好，您的续方订单已完成配药，请尽快致社区医院取药。";
            remark = "";
            sendJson.put("keyword1", "续方订单取药");
            sendJson.put("keyword2", dateFormat.format(new Date()));
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(accessToken, 11, openId, name, sendJson);
        }
        if (type == 3) {
            first =  name+ "您好，您的续方订单配送员"+doctName+"已顺利取药，续方状态变更为配送中。";
            first = name + "您好，您的续方订单配送员" + doctName + "已顺利取药，续方状态变更为配送中。";
            remark = "您可点击消息查看详情。";
            sendJson.put("keyword1", doctName);
            sendJson.put("keyword2", dateFormat.format(new Date()));
            sendJson.put("keyword3", "续方状态");
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(accessToken, 10, openId, name, sendJson);
        }
        if (type == 4) {
            first =  name+ "，您好！您的续方订单已成功配送。";
            first = name + "，您好！您的续方订单已成功配送。";
            remark = "感谢您的使用。";
            sendJson.put("keyword1", "续方申请");
            sendJson.put("keyword2", checkDoctor);//审核医生姓名
            sendJson.put("keyword2", doctName);//审核医生姓名 开处方的医生（团队长？）
            sendJson.put("keyword3", ordenTime);//订单完成时间
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(accessToken, 20, openId, name, sendJson);
        }

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

@@ -51,6 +51,10 @@ public class PushMsgTask {
    private String template_doctor_change;
    @Value("${wechat.message.template_doctor_survey}")
    private String template_doctor_survey;
    @Value("${wechat.message.template_doctor_audit}")
    private String template_doctor_audit;//审核结果通知
    @Value("${wechat.message.template_doctor_service}")
    private String template_doctor_service;//服务结果通知
    /**
     * 添加一条推送消息
@@ -589,7 +593,7 @@ public class PushMsgTask {
                m.put("keyword2", keyword2);
            }else if (type == 19) {
                temp.setUrl(url + json.getString("url"));
                temp.setTemplate_id("szpdsKDQQRDnqsoK9Oxuophb-nScXat4yy6wobnvfFw");
                temp.setTemplate_id(template_doctor_audit);
                WechatTemplateData keyword1 = new WechatTemplateData();
                keyword1.setColor("#000000");
                keyword1.setValue(json.getString("keyword1"));
@@ -600,7 +604,7 @@ public class PushMsgTask {
                m.put("keyword2", keyword2);
            }else if (type == 20) {
                temp.setUrl(url + json.getString("url"));
                temp.setTemplate_id("szpdsKDQQRDnqsoK9Oxuophb-nScXat4yy6wobnvfFw");
                temp.setTemplate_id(template_doctor_service);
                WechatTemplateData keyword1 = new WechatTemplateData();
                keyword1.setColor("#000000");
                keyword1.setValue(json.getString("keyword1"));