From 01e2d1f180b4b02777d45773987092cc2e741828 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Fri, 23 Aug 2019 15:26:45 +0800
Subject: [PATCH] update

---
 .../platform/pojo/MatdeliverFollowPushModel.java   | 23 ++++++++++++++++++++++
 .../operate/web/facade/MatdeliverFollowFacade.java | 16 +++++++--------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
index e442627..c490c0b 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
@@ -73,10 +73,33 @@ public class MatdeliverFollowPushModel extends BaseModel {
      */
    private String confirmDoctor;
 
+    /**
+     * 创建医生
+     */
+   private String createDoctor;
+
    private Date createTime;
 
    private Date updateTime;
 
+   private Integer yn;
+
+    public String getCreateDoctor() {
+        return createDoctor;
+    }
+
+    public void setCreateDoctor(String createDoctor) {
+        this.createDoctor = createDoctor;
+    }
+
+    public Integer getYn() {
+        return yn;
+    }
+
+    public void setYn(Integer yn) {
+        this.yn = yn;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
index d87c652..6606567 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -718,13 +718,15 @@ public class MatdeliverFollowFacade {
                     pushModel.setCreateTime(new Date());
                     pushModel.setUsername(patients.getUsername());
                     pushModel.setDueDate(DateUtil.parseYMD(deliverModel.getDueDate()));
+                    pushModel.setPhone(patients.getPhone());
+                    pushModel.setCreateDoctor(userId.toString());
+                    pushModel.setYn(YnEnums.YES.getId());
+                    mongoTemplate.insert(pushModel);
                 }
             }
-            mongoTemplate.insert(pushModel);
 
 
             //  推送到指定用户中
-            Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parentid)), Patients.class);
             Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
             Users users = usersService.getUsers(userId);
             MsgListRequest msgListRequest = new MsgListRequest();
@@ -732,11 +734,7 @@ public class MatdeliverFollowFacade {
             // 1 推送服务， 2 推送和短信服务 3短信服务
             MsgRequest request = new MsgRequest();
 
-            SmsConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), SmsConfigModel.class);
-            String messagePrefix = "";
-            if (model != null) {
-                messagePrefix = smsConfigFacade.getSmsPrefix(model, userId.toString());
-            }
+            String messagePrefix = organization.getName();
             request.setFirst(String.format("【%s】为了更好的掌握您产后健康情况，保障新产妇生命安全，请当天将您的身心状态反馈给医生，以便后续健康指导。\n" +
                     "请您依据实际情况进行产后信息反馈以免影响医生判断。点击“详情”按钮，进入问卷反馈，提交健康信息，\n" +
                     "您的医生将用心分析各项信息为您提供必要的指导帮助或上门访视", messagePrefix));
@@ -745,7 +743,7 @@ public class MatdeliverFollowFacade {
             request.setPhone(phone);
             request.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
             request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
-            request.setSubTypeId(SmsServiceEnums.FWKT.getId());
+            request.setSubTypeId(SmsServiceEnums.CHWJTX.getId());
             request.setStatus(SmsStatusEnums.WFS.getId());
             request.setHospitalId(hospitalId);
             request.setPatientId(parentid);
@@ -754,7 +752,7 @@ public class MatdeliverFollowFacade {
 
             request.setTypeId(0);
 
-            request.setKeyword1(users.getName());
+            request.setKeyword1(String.format(" %s--%s", messagePrefix, users.getName()));
             request.setKeyword2(DateUtil.getyyyy_MM_dd(new Date()));
 
             //  参数传递 医院id + 产后访视主键
-- 
1.8.3.1