From fbe793d7b4b9f8b8aa774f048783da2ccb3a37f0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 3 Apr 2020 15:20:10 +0800 Subject: [PATCH] update --- .../controller/AntenatalExaminationController.java | 2 +- .../operate/web/facade/AntExRecordFacade.java | 49 ++++++++++------------ 2 files changed, 23 insertions(+), 28 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 8811ca2..05e6cb0 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 @@ -266,7 +266,7 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",false); + return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",antExManagerQueryRequest.isCurrent()); } 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 d77230e..54d1d36 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 @@ -320,38 +320,33 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(result.getrLevel())) { List list = result.getrLevel(); + List ids = new ArrayList<>(); for (Map map : list) { if(map.get("id") != null) { - if (map.get("id").toString().equals("224b2329-cb82-4da3-a071-8527f8283aab")) - { - result.setLevelNum(1); - break; - } - else if (map.get("id").toString().equals("eb146c03-b19f-4e28-b85f-fda574b2283b")) - { - result.setLevelNum(2); - break; - } - else if (map.get("id").toString().equals("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) - { - result.setLevelNum(3); - break; - } - else if (map.get("id").toString().equals("315107bd-91fe-42a1-9237-752f3c046a40")) - { - result.setLevelNum(4); - break; - } - else if (map.get("id").toString().equals("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) - { - result.setLevelNum(5); - break; - } - + ids.add(map.get("id").toString()); } - + } + if (ids.contains("224b2329-cb82-4da3-a071-8527f8283aab")) + { + result.setLevelNum(1); + } + else if (ids.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) + { + result.setLevelNum(2); + } + else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) + { + result.setLevelNum(3); + } + else if (ids.contains("315107bd-91fe-42a1-9237-752f3c046a40")) + { + result.setLevelNum(4); + } + else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) + { + result.setLevelNum(5); } } } -- 1.8.3.1