From 893d67190387a7c1862761aaea6135550b828097 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 9 May 2019 16:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/operate/web/Test.java | 9 +++++++++ .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 1884742..bc5e905 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -15,6 +15,15 @@ public class Test { public static void main(String[] args) throws Exception { + Map map = new HashMap(); + map.put("111", "bbb"); + System.out.println(map); + + int h = 0; + Object key = "111"; + int hash = (key == null) ? 0 : (h = key.hashCode()) ^ (h >>> 16); + int i = (16 - 1) & hash; + System.out.print(i); } 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 8e4563f..bd49c82 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 @@ -45,6 +45,8 @@ public class BabyCheckFacade { @Autowired private BabyService babyService; + @Autowired + private BasicConfigFacade basicConfigFacade; @Autowired private MongoTemplate mongoTemplate; @@ -1652,6 +1654,10 @@ public class BabyCheckFacade { map.put("initCheckDate", DateUtil.getyyyy_MM_dd(new Date())); + // 居住类别 + List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); + map.put("liveType", liveType); + map.put("organizations", antenatalExaminationFacade.convert()); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); -- 1.8.3.1