diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index f9db959..e022302 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -458,7 +458,9 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end)); } } - + if (!appointmentTimeBoolean && !nonNull) { + query.addCriteria(Criteria.where("appointmentTime").gte(new Date())); + } // 追访结果 1-显示 当前时间 > 预约时间 // 2-显示 当前时间 < 预约时间 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java index d7a72e1..a124212 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java @@ -1,11 +1,9 @@ package com.lyms.platform.operate.web.worker; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.InitDataUtils; -import com.lyms.platform.pojo.BabyAfterVisitInfoModel; -import com.lyms.platform.pojo.BabyAfterVisitStatisticsModel; -import com.lyms.platform.pojo.BabyEyeCheck; -import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.*; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -64,6 +62,20 @@ public class BabyAfterVisitInfoModelWork implements Callable babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyId)).with(new Sort(new Sort.Order(Sort.Direction.DESC, "created"))), BabyCheckModel.class); + String checkDoctor = ""; + if (CollectionUtils.isNotEmpty(babyCheckModels)) { + BabyCheckModel checkModel = babyCheckModels.get(0); + String checkDoctorDb = checkModel.getCheckDoctor(); + if (StringUtils.isNotEmpty(checkDoctorDb)) { + checkDoctor = checkDoctorDb; + } + } + babyAfterVisitInfoModel.setCheckDoctor(checkDoctor); + } + if (Objects.equals(TYPE_EYE_CHECK, type)) { // 阳性项目 List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where(BABY_ID).is(babyId)).