From 3c04995f09e9bfbf5c074dd39bd439db03ceeb4b Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Mon, 26 Aug 2019 09:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/MatdeliverFollowFacade.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 5e2de2c..9043aa4 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
@@ -205,6 +205,10 @@ public class MatdeliverFollowFacade {
 
             //  若为问卷推送类型则更新推送状态
             if (PostpartumFollowMakeEnums.TypeEnum.WJTS.getId() == matDeliverFollowAddRequest.getMakeType()) {
+                Update update = new Update();
+                update.set("pushStatus", "3");
+                update.set("confirmTime", new Date());
+                update.set("confirmDoctor", matDeliverFollowAddRequest.getVisitDoctor());
                 mongoTemplate.updateFirst(Query.query(Criteria.where("matdeliverFollowId").is(matDeliverFollowAddRequest.getId())), Update.update("pushStatus", "3"), MatdeliverFollowPushModel.class);
             }
             //修改随访信息
@@ -808,11 +812,14 @@ public class MatdeliverFollowFacade {
                     update.set(entry.getKey(), entryValue.toString());
                 }
             }
-            update.set("visitStatus", 2);
-            update.set("visitDate", new Date());
-            update.set("pushStatus", "2");
             Query query = Query.query(Criteria.where("id").is(id));
             mongoTemplate.updateFirst(query, update, MatdeliverFollowModel.class);
+
+            Update updatePush = new Update();
+            updatePush.set("writeTime", new Date());
+            updatePush.set("pushStatus", "2");
+            mongoTemplate.updateFirst(query, updatePush, MatdeliverFollowPushModel.class);
+
             return baseResponse;
         }
         baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
-- 
1.8.3.1