jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7aa0f8986846d8aa9f58b3a856ad1ae3f2017e92

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

两癌追访

Showing 2 changed files with 4 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java View file @ 7aa0f89
... ... @@ -385,7 +385,7 @@
385 385 if (yqDaysStart != null && yqDaysEnd != null)
386 386 {
387 387 Date start = DateUtil.addDay(currentDate,-yqDaysEnd);
388   - Date end = DateUtil.addDay(currentDate,-yqDaysStart);
  388 + Date end = DateUtil.addDay(currentDate,-yqDaysStart+1);
389 389 if (null != c) {
390 390 c = c.and("nextDate").gte(start).lte(end);
391 391 } else {
... ... @@ -393,7 +393,7 @@
393 393 }
394 394 } else if (yqDaysStart != null)
395 395 {
396   - Date end = DateUtil.addDay(currentDate,-yqDaysStart);
  396 + Date end = DateUtil.addDay(currentDate,-yqDaysStart+1);
397 397 condition=condition.and("nextDate", end, MongoOper.LTE);
398 398 }
399 399 else if (yqDaysEnd != null)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 7aa0f89
... ... @@ -310,11 +310,11 @@
310 310 if (param.getYqDaysStart() != null && param.getYqDaysEnd() != null)
311 311 {
312 312 Date start = DateUtil.addDay(currentDate,-param.getYqDaysEnd());
313   - Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart());
  313 + Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()+1);
314 314 query.addCriteria(Criteria.where("nextDate").gte(start).lte(end));
315 315 } else if (param.getYqDaysStart() != null)
316 316 {
317   - Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart());
  317 + Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()+1);
318 318 query.addCriteria(Criteria.where("nextDate").lte(end));
319 319 }
320 320 else if (param.getYqDaysEnd() != null)