diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index e4a677e..412a1cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -933,10 +933,11 @@ public class BabyNutritionFacade { healthChargeQuery.setYn(YnEnums.YES.getId()); healthChargeQuery.setHospitalId(request.getHospitalId()); healthChargeQuery.setStatus(1); - // 默认值-年初 - Date startDate = areaCountFacade.getStartDate(); - healthChargeQuery.setCreatedStart(startDate); - healthChargeQuery.setCreatedEnd(new Date()); + if (request.getStartTime() == null){ + Date startDate = areaCountFacade.getStartDate(); + healthChargeQuery.setCreatedStart(startDate); + healthChargeQuery.setCreatedEnd(new Date()); + } if (request.getStartTime() != null) { healthChargeQuery.setCreatedStart(request.getStartTime()); healthChargeQuery.setCreatedEnd(request.getEndTime()); @@ -1034,7 +1035,7 @@ public class BabyNutritionFacade { hashMap.put("cardNo", mongoTemplateOne.getVcCardNo()); hashMap.put("weight", weight); hashMap.put("babyHeight", babyHeight); - hashMap.put("createTime", createTime); + hashMap.put("createTime", healthChargeModel.getCreated()); hashMap.put("interpretDoctorName", doctorName); hashMap.put("id", babyNutritionId); list.add(hashMap);