From 299ac789e5f7c173e1feb999f81f2c44c9f2b7a4 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 17 Feb 2022 18:44:01 +0800 Subject: [PATCH] update --- .../lyms/platform/operate/web/facade/CancerScreeningFacade.java | 9 +++++++-- .../operate/web/service/impl/CervicalCancerServiceImpl.java | 7 ++++++- 2 files changed, 13 insertions(+), 3 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 16fb4a4..6fe9664 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 @@ -636,9 +636,14 @@ public class CancerScreeningFacade { breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3)); } } - //判断集合中下次预约追访时间有没有,没有不需要增加 + //新增的时候，判断集合中下次预约追访时间有没有,没有不需要增加,修改的时候需要删除这条追访 if(null==breastAfterVisitModel.getNextAfterVisitTime()){ - return; + if(type==1){ + return; + }else { + Query query=new Query(Criteria.where("parentId").is(cancerScreeningModel.getId())); + mongoTemplate.remove(query,BreastAfterVisitModel.class); + } } //新增和修改追访主表 if(type==1) { 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 b988e08..d15a433 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 @@ -1220,7 +1220,12 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } //判断集合中有没有常规推荐,没有不需要增加随访 if(null==cervixVisitModel.getRuleRecommend()){ - return; + if(type==1){ + return; + }else { + Query query=new Query(Criteria.where("parentId").is(cervicalCancerRequest.getId())); + mongoTemplate.remove(query,CervixVisitModel.class); + } } //新增和修改随访主表 if(type==1) { -- 1.8.3.1