From 779e13b058840ff8588e3d4f1d16b406ebff6b5a Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 11 Oct 2018 11:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=20=E5=85=AC=E5=8D=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 6 +++--- .../lyms/platform/operate/web/controller/QhdJbgwController.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index e575006..84495c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -925,11 +925,11 @@ public class QhdJbgwInterface { babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); models = babyBookbuildingService.queryBabyBuildByCond(babyQuery1); - BabyModelQuery babyQuery = new BabyModelQuery(); + /*BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - babyQuery.setYn(YnEnums.YES.getId()); - models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + //babyQuery.setYn(YnEnums.YES.getId()); + models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery);*/ if((null != models && models.size() > 0) || (null != models1 && models1.size() > 0)){ allModels.addAll(models); allModels.addAll(models1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java index 8234ef2..7f2d5f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java @@ -153,5 +153,13 @@ public class QhdJbgwController { return null; } + @RequestMapping(method = RequestMethod.GET,value = "/qhd/testxse") + @ResponseBody + public List> qhdxinshenger(String startDate,String endDate){ + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ + return qhdJbgwInterface.getXse(startDate, endDate); + } + return null; + } } -- 1.8.3.1