diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 8bc5300..e82ffb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -175,10 +175,10 @@ public class MicroelementFacade { if (start != null && end != null) { Date currentDate = new Date(); - Date start1 = DateUtil.addMonth(currentDate, -start); - Date end2 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); - query.setBirthStart(end2); - query.setBirthEnd(start1); + Date endDate = DateUtil.addMonth(currentDate, -start); + Date startDate = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); + query.setBirthStart(startDate); + query.setBirthEnd(endDate); } System.out.println(query.convertToQuery().convertToMongoQuery().toString()); List models = microelementService.queryMicroelementList(query); @@ -198,7 +198,7 @@ public class MicroelementFacade { data.put("vcCardNo",babyModel.getVcCardNo()); data.put("mcardNo",babyModel.getMcertNo()); data.put("microelements", model.getMicroelements()); - data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); + data.put("age", com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()))); data.put("mname", babyModel.getMname()); data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); dataList.add(data);