From 39576b04f916b2e429347d8db32fba0c93743d6f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Dec 2016 16:02:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/AntenatalExaminationController.java | 9 ++++++--- .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 05db676..90759f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -176,8 +176,11 @@ public class AntenatalExaminationController extends BaseController { * * @return */ - public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest){ - - return null; + @RequestMapping(method = RequestMethod.GET, value = "/antex/antexrecordlist") + @ResponseBody + @TokenRequired + public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antExRecordFacade.findList(antExManagerQueryRequest,loginState.getId()); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 81be80b..4276a6f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -60,7 +60,6 @@ public class AntExRecordFacade { * @return */ public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setHospitalId(hospitalId); @@ -70,13 +69,13 @@ public class AntExRecordFacade { antExRecordQuery.setName(antExManagerQueryRequest.getName()); antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone()); - List data =new ArrayList<>(); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); if (CollectionUtils.isNotEmpty(antExRecordModelList)) { for (AntExRecordModel e : antExRecordModelList) { AntExManagerResult antExManagerResult = new AntExManagerResult(); antExManagerResult.convertToResult(e); + data.add(antExManagerResult); } } return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -- 1.8.3.1