jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 44d489d40de9be5a4c018e42e2408da6f773e60c

Authored by shiyang
1 parent d07ed3ba48
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 4 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java View file @ 44d489d
... ... @@ -377,8 +377,7 @@
377 377 MongoCondition con = MongoCondition.newInstance();
378 378 MongoCondition con1 = MongoCondition.newInstance("nextAfterVisitTime", nextAfterVisitTime, MongoOper.LTE);
379 379 MongoCondition con2 = MongoCondition.newInstance("nextAfterVisitTime", false, MongoOper.EXISTS);
380   - MongoCondition con3 = MongoCondition.newInstance("nextAfterVisitTime", null, MongoOper.IS);
381   - c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
  380 + c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
382 381 }
383 382 Criteria c3=MongoCondition.newInstance().getCriteria();
384 383 if (null != nextAfterVisitTimeStart &&null!= nextAfterVisitTimeEnd) {
platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java View file @ 44d489d
... ... @@ -337,8 +337,7 @@
337 337 MongoCondition con = MongoCondition.newInstance();
338 338 MongoCondition con1 = MongoCondition.newInstance("nextAfterVisitTime", nextAfterVisitTime, MongoOper.LTE);
339 339 MongoCondition con2 = MongoCondition.newInstance("nextAfterVisitTime", false, MongoOper.EXISTS);
340   - MongoCondition con3 = MongoCondition.newInstance("nextAfterVisitTime", null, MongoOper.IS);
341   - c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
  340 + c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
342 341 }
343 342  
344 343 Criteria c3=MongoCondition.newInstance().getCriteria();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 44d489d
... ... @@ -809,9 +809,7 @@
809 809 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
810 810 }
811 811 //选择不需要预约下次追访时间置为空
812   - if(0==RecordModel.getAppointment()){
813   - model.setNextAfterVisitTime(null);
814   - }
  812 +
815 813  
816 814 breastAfterVisitService.updateOneBreastAfterVisit(model,1);
817 815  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 44d489d
... ... @@ -1290,9 +1290,7 @@
1290 1290 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
1291 1291 }
1292 1292 //选择不需要预约下次追访时间置为空
1293   - if(0==RecordModel.getAppointment()){
1294   - model.setNextAfterVisitTime(null);
1295   - }
  1293 +
1296 1294 cervixVisitService.updateOneCervixVisit(model,1);
1297 1295  
1298 1296 return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);