From e364da5a5974384e3a9637e538c132b58c579756 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 15 Feb 2022 09:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=B8=82=E5=A6=87=E5=B9=BC?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E4=B8=A4=E7=99=8C=E9=9C=80=E6=B1=82-?=
 =?UTF-8?q?=E5=AE=AB=E9=A2=88=E7=99=8C=E9=9A=8F=E8=AE=BF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=8F=E8=AE=BF=E8=AE=B0=E5=BD=95=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B8=BB=E9=9A=8F=E8=AE=BF=E8=A1=A8-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=A2=84=E7=BA=A6=E4=B8=8B=E6=AC=A1=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/CancerScreeningFacade.java  | 13 ++++++++-----
 .../operate/web/service/impl/CervicalCancerServiceImpl.java | 10 +++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
index cccdc1c..54ae2d6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 import scala.Int;
 import scala.util.parsing.combinator.testing.Str;
@@ -808,11 +809,13 @@ public class CancerScreeningFacade {
                 model.setNextAfterVisitTime(RecordModel.getNextAfterVisitTime());
                 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
             }
-            //选择不需要预约下次追访时间置为空
-
-
-            breastAfterVisitService.updateOneBreastAfterVisit(model,1);
-
+            Update update=MongoConvertHelper
+                    .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
+            //选择不需要预约下次追访时间,删除该字段。
+            if(0==RecordModel.getAppointment()){
+                update.unset("nextAfterVisitTime");
+            }
+            mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(model.getId())), update, BreastAfterVisitModel.class);
             return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index f9ab2f6..907aef5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -1289,9 +1289,13 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                 model.setNextAfterVisitTime(RecordModel.getNextAfterVisitTime());
                 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
             }
-            //选择不需要预约下次追访时间置为空
-
-            cervixVisitService.updateOneCervixVisit(model,1);
+            Update update=MongoConvertHelper
+                    .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
+            //选择不需要预约下次追访时间,删除该字段。
+            if(0==RecordModel.getAppointment()){
+                update.unset("nextAfterVisitTime");
+            }
+            mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(model.getId())), update, CervixVisitModel.class);
 
             return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
         } catch (Exception e) {
-- 
1.8.3.1