diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 68b4ae9..6b34762 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -350,8 +350,9 @@ public class CouponServiceImpl implements CouponService { Date midDate = null; Date startDate = null; Date endDate = null; + List patients = null; if(typeMap.get(PREGNANT_WOMAN).contains(couponType)) {/** 孕妇: 根据末次月经对比 midDate = 末次月经时间 */ - List patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)), Patients.class); + patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)), Patients.class); if(CollectionUtils.isEmpty(patients)) { BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); if(baby != null) {/** 孕妇没查到就查儿童 */ @@ -363,7 +364,7 @@ public class CouponServiceImpl implements CouponService { } midDate = patients.get(0).getFmDate(); } else {/** 产妇或者儿童:根据分娩时间对比 midDate = 分娩时间 */ - List patients = mongoTemplate.find(Query.query(Criteria.where("type").is(3).and("hospitalId").is(hospitalId).and("pid").is(userId)) + patients = mongoTemplate.find(Query.query(Criteria.where("type").is(3).and("hospitalId").is(hospitalId).and("pid").is(userId)) .with(new Sort(Sort.Direction.DESC, "fmDate")), Patients.class); if(CollectionUtils.isEmpty(patients)) { @@ -375,6 +376,7 @@ public class CouponServiceImpl implements CouponService { if(midDate != null) { if(unitType == 1) { /** 孕周: startDate = lastMenses + start*7、 endDate = lastMenses + end*7 + 6*/ + midDate = patients.get(0).getLastMenses(); startDate = DateUtils.addDays(midDate, start * 7); endDate = DateUtils.addDays(midDate, end * 7 + 6); } else if(unitType == 2) { /** 天数 stratDate = 孕妇:fmDate/儿童:birth + start、 endDate = lastMenses + end */ @@ -384,7 +386,6 @@ public class CouponServiceImpl implements CouponService { startDate = DateUtils.addMonths(midDate, start); endDate = DateUtils.addMonths(midDate, end + 1); } -// if(DateUtil.isBetween(midDate, startDate, endDate)) { if(DateUtil.isBetween(new Date(), startDate, endDate)) { return true; }