代办消息体修改

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

@@ -48,6 +48,8 @@ public class PushMsgTask {
    private String template_consult_reply;
    @Value("${wechat.message.template_schedule_remind}")
    private String template_schedule_remind;
    @Value("${wechat.message.template_service_remind}")
    private String template_service_remind;
    @Value("${pushMes.method}")
    private String putMesMethod;
    @Value("${pushMes.redis_prescription_title}")
@@ -87,6 +89,7 @@ public class PushMsgTask {
     *
     * @param access_token
     * @param type         1：处方待处理提醒  2：服务状态提醒  3：居民体征异常提醒  4：咨询请求通知  5：签约申请通知  6：随访提醒  7：处理结果通知 8 咨询回复提醒 9 代办事项提醒
     *                     10:服务待处理提醒
     * @param openid       发送对象openID
     * @param url          模板消息跳转链接
     * @param first        消息头
@@ -329,6 +332,9 @@ public class PushMsgTask {
            case 9:
                templateId = template_schedule_remind;
                break;
            case 10:
                templateId = template_service_remind;
                break;
        }
        return templateId;
    }

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

@@ -48,7 +48,9 @@ wechat:
   #咨询回复提醒
   template_consult_reply:  sjnflOikO0WqMp4e338G8I0eFUXd6h8ljwgAlPZj5Tw
   #代办事项提醒
   template_schedule_remind:  sjnflOikO0WqMp4e338G8I0eFUXd6h8ljwgAlPZj5Tw
   template_schedule_remind:  9l1CBFlnJJaqWXW2UVQfgUidhtt5Fff_1L50RgXpIY8
   #服务待处理提醒
   template_service_remind:  v2iqCHvqNLiU0PBBMIEPkB40xi8eUtdpsjwyxw-euo4
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/message/HealthMessageJob.java

@@ -136,8 +136,7 @@ public class HealthMessageJob implements Job {
                        sendParams.add(new BasicNameValuePair("first", doctor.getName()+"医生您好。" + content));
                        sendParams.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                        String date = format.format(new Date());
                        String keywords = "分配健管师" + "," + date  ;
                        String keywords = "分配健管师" + "," +doctor.getHosptialName()+","+ doctor.getName()  ;
                        sendParams.add(new BasicNameValuePair("keywords", keywords));
                        HttpClientUtil.post(url, sendParams, "UTF-8");

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

@@ -138,8 +138,7 @@ public class HealthMessageJob implements Job {
                        sendParams.add(new BasicNameValuePair("first", doctor.getName()+"医生您好。" + content));
                        sendParams.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                        String date = format.format(new Date());
                        String keywords = "分配健管师" + "," + date  ;
                        String keywords = "分配健管师" + "," + doctor.getHospitalName()+ "," + doctor.getName();
                        sendParams.add(new BasicNameValuePair("keywords", keywords));
                        httpClientUtil.post(url, sendParams, "UTF-8");

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

@@ -766,9 +766,7 @@ public class PatientPrescriptionPayService extends BaseService {
                                        sendParams.add(new BasicNameValuePair("url", targetUrl));
                                        sendParams.add(new BasicNameValuePair("first", doctor.getName()+"医生您好。" + content + ",一个尽快分配。"));
                                        sendParams.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                                        String date = format.format(new Date());
                                        String keywords = "分配配送员" + "," + date  ;
                                        String keywords = "分配配送员" + "," + doctor.getHospitalName() + "," +doctor.getName();
                                        sendParams.add(new BasicNameValuePair("keywords", keywords));
                                        httpClientUtil.post(url, sendParams, "UTF-8");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionAdjustController.java

@@ -78,8 +78,7 @@ public class PrescriptionAdjustController extends BaseController {
                    params.add(new BasicNameValuePair("first", doctor.getName() + "医生您好。您有1个续方申请已在线下调整完成，请尽快进行CA认证."));
                    params.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                    SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                    String date = format.format(new Date());
                    String keywords = "续方审核CA认证" +"," + date;
                    String keywords = "续方审核CA认证" +"," + doctor.getHospitalName() + "," +doctor.getName();
                    params.add(new BasicNameValuePair("keywords", keywords));
                    httpClientUtil.post(url, params, "UTF-8");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -809,6 +809,7 @@ public class ConsultController extends WeixinBaseController {
                        String doctorOpenID = doctor.getOpenid();
                        if (StringUtils.isNotEmpty(doctorOpenID)) {
                                String title = "";
                                String repContent = "";
                                Consult consultSingle = consultDao.findByCode(log.getConsult());
                                if (consultSingle!=null){
                                    Integer singleType = consultSingle .getType();
@@ -817,6 +818,13 @@ public class ConsultController extends WeixinBaseController {
                                    }else if(singleType != null && singleType !=8 ){
                                        title = consultSingle.getSymptoms();
                                    }
                                    if (type == 3){
                                        repContent = "语音消息";
                                    }else if (type == 2){
                                        repContent = "图片消息";
                                    }else {
                                        repContent = content;
                                    }
                                    String first = "居民" +patient.getName()+"的健康咨询有新的回复。";
                                    String url = doctorAssistant + "/wlyy/feldsher/sendDoctorTemplates";
                                    List<NameValuePair> params = new ArrayList<>();
@@ -825,7 +833,7 @@ public class ConsultController extends WeixinBaseController {
                                    params.add(new BasicNameValuePair("url", targetUrl));
                                    params.add(new BasicNameValuePair("first",  first));
                                    params.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                                    String keywords = title + "," + content +","+ doctor.getName();
                                    String keywords = title + "," + repContent +","+ doctor.getName();
                                    params.add(new BasicNameValuePair("keywords", keywords));
                                    httpClientUtil.post(url, params, "UTF-8");
@@ -1113,8 +1121,7 @@ public class ConsultController extends WeixinBaseController {
                        params.add(new BasicNameValuePair("first", doctor1.getName() + "医生您好。您的签约居民"+patient.getName()+"申请线上续方，请尽快审核。"));
                        params.add(new BasicNameValuePair("remark", "请进入手机APP查看"));
                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                        String date = format.format(new Date());
                        String keywords = "续方审核" + "," + date;
                        String keywords = "续方审核" + "," + doctor1.getHospitalName()+","+doctor1.getName();
                        params.add(new BasicNameValuePair("keywords", keywords));
                        httpClientUtil.post(url, params, "UTF-8");