jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d07ed3ba48ccb71ac72cae09b8f18409452bd74e

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

update

Showing 4 changed files with 50 additions and 27 deletions

platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java View file @ d07ed3b
... ... @@ -338,42 +338,57 @@
338 338 c = Criteria.where("nextAfterVisitTime").gte(overdueStart);
339 339 }
340 340 }
341   - if (null != nextAfterVisitTime) {
342   - if (null != c) {
343   - if(null!=overdueEnd){
344   - if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
345   - c = c.lte(overdueEnd);
346   - }else {
347   - c = c.and("nextAfterVisitTime").lte(overdueEnd);
348   - }
  341 + if (null != overdueEnd) {
  342 + if (c != null) {
  343 + if(c.getCriteriaObject().containsField("nextAfterVisitTime")){
  344 + c=c.lte(overdueEnd);
349 345 }else {
350   - if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
351   - c = c.lte(nextAfterVisitTime);
352   - }else {
353   - c = c.and("nextAfterVisitTime").lte(nextAfterVisitTime);
354   - }
  346 + c = c.and("nextAfterVisitTime").lte(overdueEnd);
355 347 }
356 348 } else {
357   - if(null!=overdueEnd){
358   - c = Criteria.where("nextAfterVisitTime").lte(overdueEnd);
359   - }else {
360   - c = Criteria.where("nextAfterVisitTime").lte(nextAfterVisitTime);
361   - }
  349 + c = Criteria.where("nextAfterVisitTime").lte(overdueEnd);
362 350 }
363 351 }
  352 +// if (null != nextAfterVisitTime) {
  353 +// if (null != c) {
  354 +// if(null!=overdueEnd){
  355 +// if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
  356 +// c = c.lte(overdueEnd);
  357 +// }else {
  358 +// c = c.and("nextAfterVisitTime").lte(overdueEnd);
  359 +// }
  360 +// }else {
  361 +// if (c.getCriteriaObject().containsField("nextAfterVisitTime")){
  362 +// c = c.lte(nextAfterVisitTime);
  363 +// }else {
  364 +// c = c.and("nextAfterVisitTime").lte(nextAfterVisitTime);
  365 +// }
  366 +// }
  367 +// } else {
  368 +// if(null!=overdueEnd){
  369 +// c = Criteria.where("nextAfterVisitTime").lte(overdueEnd);
  370 +// }else {
  371 +// c = Criteria.where("nextAfterVisitTime").lte(nextAfterVisitTime);
  372 +// }
  373 +// }
  374 +// }
364 375 Criteria c2=MongoCondition.newInstance().getCriteria();
  376 + if (null != nextAfterVisitTime) {
  377 + MongoCondition con = MongoCondition.newInstance();
  378 + MongoCondition con1 = MongoCondition.newInstance("nextAfterVisitTime", nextAfterVisitTime, MongoOper.LTE);
  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());
  382 + }
  383 + Criteria c3=MongoCondition.newInstance().getCriteria();
365 384 if (null != nextAfterVisitTimeStart &&null!= nextAfterVisitTimeEnd) {
366   - if (null != c2) {
367   - c2 = c2.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
368   - } else {
369   - c2 = Criteria.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
370   - }
  385 + c3 = c3.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
371 386 }
372 387  
373 388 if (null != c) {
374   - return new MongoCondition(c.andOperator(condition.getCriteria(),c2)).toMongoQuery();
  389 + return new MongoCondition(c.andOperator(condition.getCriteria(),c2,c3)).toMongoQuery();
375 390 }
376   - return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery();
  391 + return new MongoCondition(c2.andOperator(condition.getCriteria(),c3)).toMongoQuery();
377 392 }
378 393  
379 394 }
platform-dal/src/main/java/com/lyms/platform/query/CervixVisitQuery.java View file @ d07ed3b
... ... @@ -337,7 +337,8 @@
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   - c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  340 + MongoCondition con3 = MongoCondition.newInstance("nextAfterVisitTime", null, MongoOper.IS);
  341 + c2 = c2.orOperator(con.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
341 342 }
342 343  
343 344 Criteria c3=MongoCondition.newInstance().getCriteria();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ d07ed3b
... ... @@ -808,6 +808,10 @@
808 808 model.setNextAfterVisitTime(RecordModel.getNextAfterVisitTime());
809 809 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
810 810 }
  811 + //选择不需要预约下次追访时间置为空
  812 + if(0==RecordModel.getAppointment()){
  813 + model.setNextAfterVisitTime(null);
  814 + }
811 815  
812 816 breastAfterVisitService.updateOneBreastAfterVisit(model,1);
813 817  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ d07ed3b
... ... @@ -1289,7 +1289,10 @@
1289 1289 model.setNextAfterVisitTime(RecordModel.getNextAfterVisitTime());
1290 1290 model.setType(0);//追访状态，修改预约下次时间后改为待追访。
1291 1291 }
1292   -
  1292 + //选择不需要预约下次追访时间置为空
  1293 + if(0==RecordModel.getAppointment()){
  1294 + model.setNextAfterVisitTime(null);
  1295 + }
1293 1296 cervixVisitService.updateOneCervixVisit(model,1);
1294 1297  
1295 1298 return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);