From b795d0b8759d167672a34fe0f2ab0cb2a80c6e2d Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Mon, 3 Jun 2019 01:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/BabyNutritionFacade.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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);
-- 
1.8.3.1