Commit 01e2d1f180b4b02777d45773987092cc2e741828
1 parent
a8d93afa43
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 30 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
View file @
01e2d1f
| ... | ... | @@ -73,9 +73,32 @@ |
| 73 | 73 | */ |
| 74 | 74 | private String confirmDoctor; |
| 75 | 75 | |
| 76 | + /** | |
| 77 | + * 创建医生 | |
| 78 | + */ | |
| 79 | + private String createDoctor; | |
| 80 | + | |
| 76 | 81 | private Date createTime; |
| 77 | 82 | |
| 78 | 83 | private Date updateTime; |
| 84 | + | |
| 85 | + private Integer yn; | |
| 86 | + | |
| 87 | + public String getCreateDoctor() { | |
| 88 | + return createDoctor; | |
| 89 | + } | |
| 90 | + | |
| 91 | + public void setCreateDoctor(String createDoctor) { | |
| 92 | + this.createDoctor = createDoctor; | |
| 93 | + } | |
| 94 | + | |
| 95 | + public Integer getYn() { | |
| 96 | + return yn; | |
| 97 | + } | |
| 98 | + | |
| 99 | + public void setYn(Integer yn) { | |
| 100 | + this.yn = yn; | |
| 101 | + } | |
| 79 | 102 | |
| 80 | 103 | public String getId() { |
| 81 | 104 | return id; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
View file @
01e2d1f
| ... | ... | @@ -718,13 +718,15 @@ |
| 718 | 718 | pushModel.setCreateTime(new Date()); |
| 719 | 719 | pushModel.setUsername(patients.getUsername()); |
| 720 | 720 | pushModel.setDueDate(DateUtil.parseYMD(deliverModel.getDueDate())); |
| 721 | + pushModel.setPhone(patients.getPhone()); | |
| 722 | + pushModel.setCreateDoctor(userId.toString()); | |
| 723 | + pushModel.setYn(YnEnums.YES.getId()); | |
| 724 | + mongoTemplate.insert(pushModel); | |
| 721 | 725 | } |
| 722 | 726 | } |
| 723 | - mongoTemplate.insert(pushModel); | |
| 724 | 727 | |
| 725 | 728 | |
| 726 | 729 | // 推送到指定用户中 |
| 727 | - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parentid)), Patients.class); | |
| 728 | 730 | Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); |
| 729 | 731 | Users users = usersService.getUsers(userId); |
| 730 | 732 | MsgListRequest msgListRequest = new MsgListRequest(); |
| ... | ... | @@ -732,11 +734,7 @@ |
| 732 | 734 | // 1 推送服务， 2 推送和短信服务 3短信服务 |
| 733 | 735 | MsgRequest request = new MsgRequest(); |
| 734 | 736 | |
| 735 | - SmsConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), SmsConfigModel.class); | |
| 736 | - String messagePrefix = ""; | |
| 737 | - if (model != null) { | |
| 738 | - messagePrefix = smsConfigFacade.getSmsPrefix(model, userId.toString()); | |
| 739 | - } | |
| 737 | + String messagePrefix = organization.getName(); | |
| 740 | 738 | request.setFirst(String.format("【%s】为了更好的掌握您产后健康情况，保障新产妇生命安全，请当天将您的身心状态反馈给医生，以便后续健康指导。\n" + |
| 741 | 739 | "请您依据实际情况进行产后信息反馈以免影响医生判断。点击“详情”按钮，进入问卷反馈，提交健康信息，\n" + |
| 742 | 740 | "您的医生将用心分析各项信息为您提供必要的指导帮助或上门访视", messagePrefix)); |
| ... | ... | @@ -745,7 +743,7 @@ |
| 745 | 743 | request.setPhone(phone); |
| 746 | 744 | request.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); |
| 747 | 745 | request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 748 | - request.setSubTypeId(SmsServiceEnums.FWKT.getId()); | |
| 746 | + request.setSubTypeId(SmsServiceEnums.CHWJTX.getId()); | |
| 749 | 747 | request.setStatus(SmsStatusEnums.WFS.getId()); |
| 750 | 748 | request.setHospitalId(hospitalId); |
| 751 | 749 | request.setPatientId(parentid); |
| ... | ... | @@ -754,7 +752,7 @@ |
| 754 | 752 | |
| 755 | 753 | request.setTypeId(0); |
| 756 | 754 | |
| 757 | - request.setKeyword1(users.getName()); | |
| 755 | + request.setKeyword1(String.format(" %s--%s", messagePrefix, users.getName())); | |
| 758 | 756 | request.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); |
| 759 | 757 | |
| 760 | 758 | // 参数传递 医院id + 产后访视主键 |