From 3bb56561eb9df5a13ed0297cfe430a9a9215affa Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 11 Jun 2018 11:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/controller/BabyCheckController.java | 2 +- .../java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index f8fb549..4fd133c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -237,7 +237,7 @@ public class BabyCheckController extends BaseController{ @RequestMapping("/currentCheckBabyList") @ResponseBody @TokenRequired - public Object currentCheckBabyList(HttpServletRequest request){ + public BaseObjectResponse currentCheckBabyList(HttpServletRequest request){ return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 20eb6a9..faf656d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1745,11 +1745,9 @@ public class BabyCheckFacade { } - public List> getCurrentDayCheckBabies(Integer userId) + public BaseObjectResponse getCurrentDayCheckBabies(Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - List> babyList = new ArrayList<>(); - Date currentDay = DateUtil.parseYMD(DateUtil.getymd()); BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setHospitalId(hospitalId); @@ -1817,8 +1815,7 @@ public class BabyCheckFacade { list.add(result); } } - - return babyList; + return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } } \ No newline at end of file -- 1.8.3.1