From 846679852233cb64b97aca7211b40c2e370b79fd Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 16:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/BabyNutritionController.java    | 26 ++++++++++++++++++++++
 .../operate/web/facade/AreaCountFacade.java        |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
index 5d0a3f4..c397530 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Calendar;
+import java.util.Date;
 
 
 /**
@@ -158,10 +160,32 @@ public class BabyNutritionController extends BaseController {
     @TokenRequired
     public BaseResponse settleStatus(@Valid @RequestBody BabyNutritionSettleRequest request,
                                      HttpServletRequest httpServletRequest) {
+        getStartTimeAndEndTime(request);
         return babyNutritionFacade.settleStatus(request, getUserId(httpServletRequest));
     }
 
     /**
+     * 时差设置
+     *
+     * @param request
+     */
+    private void getStartTimeAndEndTime(@RequestBody @Valid BabyNutritionSettleRequest request) {
+        Date startTime = request.getStartTime();
+        if (startTime != null){
+            request.setStartTime(new Date(startTime.getTime() - 28800000));
+        }
+        Date endTime = request.getEndTime();
+        if (endTime != null) {
+            Calendar todayEnd = Calendar.getInstance();
+            todayEnd.setTime(new Date(endTime.getTime() - 28800000));
+            todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+            todayEnd.set(Calendar.MINUTE, 59);
+            todayEnd.set(Calendar.SECOND, 59);
+            request.setEndTime(todayEnd.getTime());
+        }
+    }
+
+    /**
      * 结算历史
      *
      * @param request
@@ -172,6 +196,7 @@ public class BabyNutritionController extends BaseController {
     @TokenRequired
     public BaseResponse settleHistoryList(@Valid @RequestBody BabyNutritionSettleRequest request,
                                      HttpServletRequest httpServletRequest) {
+        getStartTimeAndEndTime(request);
         return babyNutritionFacade.settleHistoryList(request, getUserId(httpServletRequest));
     }
 
@@ -185,6 +210,7 @@ public class BabyNutritionController extends BaseController {
     @TokenRequired
     public void settleHistoryExport(@Valid @RequestBody BabyNutritionSettleRequest request,
                                     HttpServletResponse response) {
+        getStartTimeAndEndTime(request);
         babyNutritionFacade.settleHistoryExport(request,response);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index 9c51e12..219ccb3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -1212,7 +1212,7 @@ public class AreaCountFacade {
                         int week = differentDays / 7;
                         map.put("openYumSize", week);
                     }  else {
-                        map.put("opeYumSize","");
+                        map.put("openYumSize","");
                     }
 
 
@@ -1222,7 +1222,7 @@ public class AreaCountFacade {
                     if (babyModel != null){
                         userName = babyModel.getName();
                     }
-                    map.put("opnYumSize", "");
+                    map.put("openYumSize", "");
                     map.put("serviceWeek", "");
                 }
                 map.put("patientName", userName);
-- 
1.8.3.1