|
@ -47,45 +47,49 @@ public class HealthArtListener implements MessageListener {
|
|
public void onMessage(Message message) {
|
|
public void onMessage(Message message) {
|
|
try {
|
|
try {
|
|
TextMessage textMessage = (TextMessage) message;
|
|
TextMessage textMessage = (TextMessage) message;
|
|
HealthEduArticleES healthEduArticleES = new HealthEduArticleES();
|
|
|
|
JSONObject obj = JSONObject.fromObject(textMessage.getText());
|
|
JSONObject obj = JSONObject.fromObject(textMessage.getText());
|
|
|
|
if(obj.get("patientCode")==null){
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
HealthEduArticleES healthEduArticleES = new HealthEduArticleES();
|
|
healthEduArticleES.setBatchNo(obj.get("batchNo")!=null?obj.get("batchNo").toString():null);
|
|
healthEduArticleES.setBatchNo(obj.get("batchNo")!=null?obj.get("batchNo").toString():null);
|
|
healthEduArticleES.setPatientCode(obj.get("patientCode")!=null?obj.get("patientCode").toString():null);
|
|
healthEduArticleES.setPatientCode(obj.get("patientCode")!=null?obj.get("patientCode").toString():null);
|
|
healthEduArticleES.setPatientName(obj.get("patientName")!=null?obj.get("patientName").toString():null);
|
|
healthEduArticleES.setPatientName(obj.get("patientName")!=null?obj.get("patientName").toString():null);
|
|
healthEduArticleES.setDoctorCode(obj.get("doctorCode")!=null?obj.get("doctorCode").toString():null);
|
|
healthEduArticleES.setDoctorCode(obj.get("doctorCode")!=null?obj.get("doctorCode").toString():null);
|
|
healthEduArticleES.setDoctorName(obj.get("doctorName")!=null?obj.get("doctorName").toString():null);
|
|
healthEduArticleES.setDoctorName(obj.get("doctorName")!=null?obj.get("doctorName").toString():null);
|
|
healthEduArticleES.setSendPic(obj.get("sendPic")!=null?obj.get("sendPic").toString():null);
|
|
|
|
healthEduArticleES.setSendSex(obj.get("sendSex")!=null?obj.get("sendSex").toString():null);
|
|
|
|
healthEduArticleES.setAdminTeamCode(obj.get("adminTeamCode")!=null?(Long)obj.get("adminTeamCode"):null);
|
|
|
|
healthEduArticleES.setAdminTeamName(obj.get("adminTeamName")!=null?obj.get("adminTeamCode").toString():null);
|
|
|
|
|
|
// healthEduArticleES.setSendPic(obj.get("sendPic")!=null?obj.get("sendPic").toString():null);
|
|
|
|
// healthEduArticleES.setSendSex(obj.get("sendSex")!=null?obj.get("sendSex").toString():null);
|
|
|
|
// healthEduArticleES.setAdminTeamCode(obj.get("adminTeamCode")!=null?(Long)obj.get("adminTeamCode"):null);
|
|
|
|
// healthEduArticleES.setAdminTeamName(obj.get("adminTeamName")!=null?obj.get("adminTeamCode").toString():null);
|
|
healthEduArticleES.setHospital(obj.get("hospital")!=null?obj.get("hospital").toString():null);
|
|
healthEduArticleES.setHospital(obj.get("hospital")!=null?obj.get("hospital").toString():null);
|
|
healthEduArticleES.setHospitalName(obj.get("hospitalName")!=null?obj.get("hospitalName").toString():null);
|
|
healthEduArticleES.setHospitalName(obj.get("hospitalName")!=null?obj.get("hospitalName").toString():null);
|
|
healthEduArticleES.setTown(obj.get("town")!=null?obj.get("town").toString():null);
|
|
healthEduArticleES.setTown(obj.get("town")!=null?obj.get("town").toString():null);
|
|
healthEduArticleES.setTownName(obj.get("townName")!=null?obj.get("townName").toString():null);
|
|
healthEduArticleES.setTownName(obj.get("townName")!=null?obj.get("townName").toString():null);
|
|
healthEduArticleES.setCreateTime(obj.get("createTime")!=null?(Date)obj.get("createTime"):null);
|
|
|
|
|
|
// healthEduArticleES.setCreateTime(obj.get("createTime")!=null?(Date)obj.get("createTime"):null);
|
|
healthEduArticleES.setSendType(obj.get("sendType")!=null?(Integer)obj.get("sendType"):null);
|
|
healthEduArticleES.setSendType(obj.get("sendType")!=null?(Integer)obj.get("sendType"):null);
|
|
|
|
healthEduArticleES.setSendName(obj.get("sendName")!=null?obj.get("sendName").toString():null);
|
|
healthEduArticleES.setSendLevel(obj.get("sendLevel")!=null?obj.get("sendLevel").toString():null);
|
|
healthEduArticleES.setSendLevel(obj.get("sendLevel")!=null?obj.get("sendLevel").toString():null);
|
|
healthEduArticleES.setArticleId(obj.get("articleId")!=null?obj.get("articleId").toString():null);
|
|
healthEduArticleES.setArticleId(obj.get("articleId")!=null?obj.get("articleId").toString():null);
|
|
healthEduArticleES.setArticleTitle(obj.get("articleTitle")!=null?obj.get("articleTitle").toString():null);
|
|
healthEduArticleES.setArticleTitle(obj.get("articleTitle")!=null?obj.get("articleTitle").toString():null);
|
|
healthEduArticleES.setArticleCover(obj.get("articleCover")!=null?obj.get("articleCover").toString():null);
|
|
healthEduArticleES.setArticleCover(obj.get("articleCover")!=null?obj.get("articleCover").toString():null);
|
|
healthEduArticleES.setArticleContent(obj.get("articleContent")!=null?obj.get("articleContent").toString():null);
|
|
healthEduArticleES.setArticleContent(obj.get("articleContent")!=null?obj.get("articleContent").toString():null);
|
|
healthEduArticleES.setArticleCategoryId(obj.get("articleCategoryId")!=null?obj.get("articleCategoryId").toString():null);
|
|
healthEduArticleES.setArticleCategoryId(obj.get("articleCategoryId")!=null?obj.get("articleCategoryId").toString():null);
|
|
healthEduArticleES.setFirstLevelCategoryId(obj.get("firstLevelCategoryId")!=null?obj.get("firstLevelCategoryId").toString():null);
|
|
|
|
healthEduArticleES.setFirstLevelCategoryName(obj.get("firstLevelCategoryName")!=null?obj.get("firstLevelCategoryName").toString():null);
|
|
|
|
healthEduArticleES.setSecondLevelCategoryId(obj.get("secondLevelCategoryId")!=null?obj.get("secondLevelCategoryId").toString():null);
|
|
|
|
healthEduArticleES.setSecondLevelCategoryName(obj.get("secondLevelCategoryName")!=null?obj.get("secondLevelCategoryName").toString():null);
|
|
|
|
|
|
// healthEduArticleES.setFirstLevelCategoryId(obj.get("firstLevelCategoryId")!=null?obj.get("firstLevelCategoryId").toString():null);
|
|
|
|
// healthEduArticleES.setFirstLevelCategoryName(obj.get("firstLevelCategoryName")!=null?obj.get("firstLevelCategoryName").toString():null);
|
|
|
|
// healthEduArticleES.setSecondLevelCategoryId(obj.get("secondLevelCategoryId")!=null?obj.get("secondLevelCategoryId").toString():null);
|
|
|
|
// healthEduArticleES.setSecondLevelCategoryName(obj.get("secondLevelCategoryName")!=null?obj.get("secondLevelCategoryName").toString():null);
|
|
healthEduArticleES.setOperatorId(obj.get("operatorId")!=null?obj.get("operatorId").toString():null);
|
|
healthEduArticleES.setOperatorId(obj.get("operatorId")!=null?obj.get("operatorId").toString():null);
|
|
healthEduArticleES.setIsRead(obj.get("isRead")!=null?(Integer)obj.get("isRead"):null);
|
|
|
|
healthEduArticleES.setArticleSource(obj.get("articleSource")!=null?obj.get("articleSource").toString():null);
|
|
|
|
healthEduArticleES.setRoleList(obj.get("roleList")!=null?(List)obj.get("roleList"):null);
|
|
|
|
|
|
// healthEduArticleES.setIsRead(obj.get("isRead")!=null?(Integer)obj.get("isRead"):null);
|
|
|
|
// healthEduArticleES.setArticleSource(obj.get("articleSource")!=null?obj.get("articleSource").toString():null);
|
|
|
|
// healthEduArticleES.setRoleList(obj.get("roleList")!=null?(List)obj.get("roleList"):null);
|
|
healthEduArticleES.setLeaveWords(obj.get("leaveWords")!=null?obj.get("leaveWords").toString():null);
|
|
healthEduArticleES.setLeaveWords(obj.get("leaveWords")!=null?obj.get("leaveWords").toString():null);
|
|
healthEduArticleES.setCurrentUserRoleCode(obj.get("currentUserRoleCode")!=null?obj.get("currentUserRoleCode").toString():null);
|
|
|
|
healthEduArticleES.setCurrentUserRoleLevel(obj.get("currentUserRoleLevel")!=null?obj.get("currentUserRoleLevel").toString():null);
|
|
|
|
|
|
// healthEduArticleES.setCurrentUserRoleCode(obj.get("currentUserRoleCode")!=null?obj.get("currentUserRoleCode").toString():null);
|
|
|
|
// healthEduArticleES.setCurrentUserRoleLevel(obj.get("currentUserRoleLevel")!=null?obj.get("currentUserRoleLevel").toString():null);
|
|
healthEduArticleES.setSendSource(obj.get("sendSource")!=null?(Integer)obj.get("sendSource"):null);
|
|
healthEduArticleES.setSendSource(obj.get("sendSource")!=null?(Integer)obj.get("sendSource"):null);
|
|
healthEduArticleES.setAllCount(obj.get("allCount")!=null?(Integer)obj.get("allCount"):null);
|
|
|
|
healthEduArticleES.setReadNumber(obj.get("readNumber")!=null?(Long)obj.get("readNumber"):null);
|
|
|
|
|
|
// healthEduArticleES.setAllCount(obj.get("allCount")!=null?(Integer)obj.get("allCount"):null);
|
|
|
|
// healthEduArticleES.setReadNumber(obj.get("readNumber")!=null?(Long)obj.get("readNumber"):null);
|
|
healthEduArticleES.setNewArricleFlag(obj.get("newArricleFlag")!=null?(Boolean)obj.get("newArricleFlag"):null);
|
|
healthEduArticleES.setNewArricleFlag(obj.get("newArricleFlag")!=null?(Boolean)obj.get("newArricleFlag"):null);
|
|
healthEduArticleES.setUserType(obj.get("userType")!=null?(Integer) obj.get("userType"):null);
|
|
|
|
|
|
// healthEduArticleES.setUserType(obj.get("userType")!=null?(Integer) obj.get("userType"):null);
|
|
// HealthEduArticleES one = (HealthEduArticleES)JSONObject.toBean(JSONObject.fromObject(textMessage.getText()),HealthEduArticleES.class);
|
|
// HealthEduArticleES one = (HealthEduArticleES)JSONObject.toBean(JSONObject.fromObject(textMessage.getText()),HealthEduArticleES.class);
|
|
// logger.info(jo.toString());
|
|
// logger.info(jo.toString());
|
|
// System.out.printf(healthEduArticleES.toString());
|
|
// System.out.printf(healthEduArticleES.toString());
|
|
@ -104,23 +108,26 @@ public class HealthArtListener implements MessageListener {
|
|
|
|
|
|
// healthEduArticlePatients.stream().forEach(one -> {
|
|
// healthEduArticlePatients.stream().forEach(one -> {
|
|
Patient patient = patientService.findByCode(one.getPatientCode());
|
|
Patient patient = patientService.findByCode(one.getPatientCode());
|
|
|
|
if(patient==null){
|
|
|
|
return ;
|
|
|
|
}
|
|
try {
|
|
try {
|
|
//卫纪委发送不推IM
|
|
//卫纪委发送不推IM
|
|
if (1 == one.getSendType()) {
|
|
if (1 == one.getSendType()) {
|
|
consultService.sendMucMessageBySingnType(one.getDoctorCode(), one.getDoctorName(), patient.getCode(), "{\"title\":\"" + one.getArticleTitle() + "\",\"type\":0,\"id\":\"" + one.getId() + "\",\"img\":\"" + one.getArticleCover() + "\",\"content\":\"为了您的健康,我给您发送了一篇文章,请咨询查阅,如有问题,可随时与我沟通\"}", "4", patient.getName());
|
|
|
|
|
|
consultService.sendMucMessageBySingnType(one.getDoctorCode(), one.getDoctorName(), one.getPatientCode(), "{\"title\":\"" + one.getArticleTitle() + "\",\"type\":0,\"id\":\"" + one.getId() + "\",\"img\":\"" + one.getArticleCover() + "\",\"content\":\"为了您的健康,我给您发送了一篇文章,请咨询查阅,如有问题,可随时与我沟通\"}", "4", patient.getName());
|
|
if (StringUtils.isNotBlank(one.getLeaveWords())) {
|
|
if (StringUtils.isNotBlank(one.getLeaveWords())) {
|
|
//发送备注
|
|
//发送备注
|
|
consultService.sendMucMessageBySingnType(one.getDoctorCode(), one.getDoctorName(), patient.getCode(), one.getLeaveWords(), ImUtill.CONTENT_TYPE_TEXT, patient.getName());
|
|
|
|
|
|
consultService.sendMucMessageBySingnType(one.getDoctorCode(), one.getDoctorName(), one.getPatientCode(), one.getLeaveWords(), ImUtill.CONTENT_TYPE_TEXT, patient.getName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 推送消息给微信端
|
|
// 推送消息给微信端
|
|
org.json.JSONObject json = new org.json.JSONObject();
|
|
org.json.JSONObject json = new org.json.JSONObject();
|
|
json.put("first", patient.getName() + ",您好! " + one.getSendName() + (one.getSendType()==2 ? "":"医生") +"给您发来了一篇患教文章");
|
|
|
|
json.put("toUser", patient.getCode());
|
|
|
|
|
|
json.put("first", one.getPatientName() + ",您好! " + one.getSendName() + (one.getSendType()==2 ? "":"医生") +"给您发来了一篇患教文章");
|
|
|
|
json.put("toUser", one.getPatientCode());
|
|
json.put("article", one.getArticleId() + "");
|
|
json.put("article", one.getArticleId() + "");
|
|
json.put("title", one.getArticleTitle());
|
|
json.put("title", one.getArticleTitle());
|
|
json.put("doctorName", one.getDoctorName());
|
|
json.put("doctorName", one.getDoctorName());
|
|
json.put("represented", patient.getCode());//被代理人
|
|
|
|
|
|
json.put("represented", one.getPatientCode());//被代理人
|
|
json.put("date", DateUtil.dateToStrLong(DateUtil.getNowDate()));
|
|
json.put("date", DateUtil.dateToStrLong(DateUtil.getNowDate()));
|
|
json.put("remark", org.springframework.util.StringUtils.isEmpty(one.getLeaveWords()) ? " " : one.getLeaveWords());
|
|
json.put("remark", org.springframework.util.StringUtils.isEmpty(one.getLeaveWords()) ? " " : one.getLeaveWords());
|
|
json.put("newArricleFlag",one.getNewArricleFlag());
|
|
json.put("newArricleFlag",one.getNewArricleFlag());
|