jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 19a84616970fa2755ab82a08b0fb6f0e216c1c4b

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

update

Showing 2 changed files with 41 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/BreastAfterVisitQuery.java View file @ 19a8461
... ... @@ -63,6 +63,8 @@
63 63 private Date afterVisitTimeEnd;
64 64 //预约下次追访日期
65 65 private Date nextAfterVisitTime;
  66 + private Date nextAfterVisitTimeStart;
  67 + private Date nextAfterVisitTimeEnd;
66 68 //逾期天数
67 69 private Date overdueStart;
68 70 private Date overdueEnd;
... ... @@ -236,6 +238,22 @@
236 238 this.overdueEnd = overdueEnd;
237 239 }
238 240  
  241 + public Date getNextAfterVisitTimeStart() {
  242 + return nextAfterVisitTimeStart;
  243 + }
  244 +
  245 + public void setNextAfterVisitTimeStart(Date nextAfterVisitTimeStart) {
  246 + this.nextAfterVisitTimeStart = nextAfterVisitTimeStart;
  247 + }
  248 +
  249 + public Date getNextAfterVisitTimeEnd() {
  250 + return nextAfterVisitTimeEnd;
  251 + }
  252 +
  253 + public void setNextAfterVisitTimeEnd(Date nextAfterVisitTimeEnd) {
  254 + this.nextAfterVisitTimeEnd = nextAfterVisitTimeEnd;
  255 + }
  256 +
239 257 /**
240 258 * @return
241 259 */
242 260  
243 261  
... ... @@ -345,12 +363,19 @@
345 363 }
346 364 }
347 365 }
  366 + Criteria c2=MongoCondition.newInstance().getCriteria();
  367 + if (null != nextAfterVisitTimeStart &&null!= nextAfterVisitTimeEnd) {
  368 + if (null != c2) {
  369 + c2 = c2.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
  370 + } else {
  371 + c2 = Criteria.where("nextAfterVisitTime").gte(nextAfterVisitTimeStart).lte(nextAfterVisitTimeEnd);
  372 + }
  373 + }
348 374  
349 375 if (null != c) {
350   - condition = condition.andCondition(new MongoCondition(c));
  376 + return new MongoCondition(c.andOperator(condition.getCriteria(),c2)).toMongoQuery();
351 377 }
352   -
353   - return condition.toMongoQuery();
  378 + return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery();
354 379 }
355 380  
356 381 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 19a8461
... ... @@ -682,6 +682,18 @@
682 682 query.setCheckDateStart(DateUtil.parseYMD(arrs[0]));
683 683 query.setCheckDateEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
684 684 }
  685 + //随访日期筛选
  686 + if (StringUtils.isNotEmpty(queryRequest.getAfterVisitTime())) {
  687 + String[] arrs = queryRequest.getAfterVisitTime().split(" - ");
  688 + query.setAfterVisitTimeStart(DateUtil.parseYMD(arrs[0]));
  689 + query.setAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
  690 + }
  691 + //预约下次检查日期筛选
  692 + if (StringUtils.isNotEmpty(queryRequest.getNextAfterVisitTime())) {
  693 + String[] arrs = queryRequest.getNextAfterVisitTime().split(" - ");
  694 + query.setNextAfterVisitTimeStart(DateUtil.parseYMD(arrs[0]));
  695 + query.setNextAfterVisitTimeEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
  696 + }
685 697 //下次追访时间保存时已经加过时间逻辑，这里直接小于等于当前时间（默认规则）
686 698 query.setNextAfterVisitTime(new Date());
687 699 //逾期天数
... ... @@ -739,6 +751,7 @@
739 751 }
740 752 }
741 753 map.put("yqsj",yqsj);
  754 + map.put("afterVisitTime", DateUtil.getyyyy_MM_dd(model.getAfterVisitTime()));//随访时间
742 755 map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(model.getNextAfterVisitTime()));//下次预约时间
743 756 map.put("checkDate", DateUtil.getyyyy_MM_dd(model.getCheckDate()));//检査日期
744 757 map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见