Commit 299ac789e5f7c173e1feb999f81f2c44c9f2b7a4
1 parent
94745e5e8e
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 13 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
299ac78
| ... | ... | @@ -636,9 +636,14 @@ |
| 636 | 636 | breastAfterVisitModel.setNextAfterVisitTime(DateUtil.addMonth(cancerScreeningModel.getCreated(),3)); |
| 637 | 637 | } |
| 638 | 638 | } |
| 639 | - //判断集合中下次预约追访时间有没有,没有不需要增加 | |
| 639 | + //新增的时候，判断集合中下次预约追访时间有没有,没有不需要增加,修改的时候需要删除这条追访 | |
| 640 | 640 | if(null==breastAfterVisitModel.getNextAfterVisitTime()){ |
| 641 | - return; | |
| 641 | + if(type==1){ | |
| 642 | + return; | |
| 643 | + }else { | |
| 644 | + Query query=new Query(Criteria.where("parentId").is(cancerScreeningModel.getId())); | |
| 645 | + mongoTemplate.remove(query,BreastAfterVisitModel.class); | |
| 646 | + } | |
| 642 | 647 | } |
| 643 | 648 | //新增和修改追访主表 |
| 644 | 649 | if(type==1) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
299ac78
| ... | ... | @@ -1220,7 +1220,12 @@ |
| 1220 | 1220 | } |
| 1221 | 1221 | //判断集合中有没有常规推荐,没有不需要增加随访 |
| 1222 | 1222 | if(null==cervixVisitModel.getRuleRecommend()){ |
| 1223 | - return; | |
| 1223 | + if(type==1){ | |
| 1224 | + return; | |
| 1225 | + }else { | |
| 1226 | + Query query=new Query(Criteria.where("parentId").is(cervicalCancerRequest.getId())); | |
| 1227 | + mongoTemplate.remove(query,CervixVisitModel.class); | |
| 1228 | + } | |
| 1224 | 1229 | } |
| 1225 | 1230 | //新增和修改随访主表 |
| 1226 | 1231 | if(type==1) { |