jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 42da5ea0a2b0aa7b1eff5861620ac6d4613027d3

Authored by yangfei
2 parents 05f6879fa7 f87c10a7b1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ 42da5ea
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.beans.MsgRequest;
5 5 import com.lyms.platform.biz.service.*;
6 6 import com.lyms.platform.common.enums.*;
  7 +import com.lyms.platform.common.utils.DateUtil;
7 8 import com.lyms.platform.common.utils.StringUtils;
8 9 import com.lyms.platform.msg.service.IBaseService;
9 10 import com.lyms.platform.msg.utils.DateUtils;
... ... @@ -571,8 +572,8 @@
571 572 Date orderDate = DateUtils.addDay(new Date(), sendTimeType);
572 573 orderDate = DateUtils.formatDate(orderDate,DateUtils.Y_M_D);
573 574  
574   - List<BabyEyeCheck> checkModels = mongoTemplate.find(Query.query(Criteria.where("nextCheckTime").is(orderDate)
575   - .and("yn").ne("0").and("hospitalId").is(tempHid)), BabyEyeCheck.class);
  575 + List<BabyEyeCheck> checkModels = mongoTemplate.find(Query.query(Criteria.where("nextCheckTime").gte(orderDate).lt(DateUtils.addDay(orderDate, 1))
  576 + .and("yn").is("1").and("hospitalId").is(tempHid)), BabyEyeCheck.class);
576 577 if (CollectionUtils.isNotEmpty(checkModels))
577 578 {
578 579 for(BabyEyeCheck eyecheck : checkModels)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 42da5ea
... ... @@ -2495,7 +2495,7 @@
2495 2495 data.put("serviceStatus", StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
2496 2496 data.put("nextDate", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
2497 2497 data.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
2498   - data.put("created", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getCreated())));
  2498 + data.put("created", model.getBuildDate() == null ? "-" : StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBuildDate())));
2499 2499  
2500 2500 String diagnose = "";
2501 2501 if (StringUtils.isNotEmpty(model.getPid())) {