From 34d82ec90e7d63ff3fc6713d547c1a8dbe74c0b8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Aug 2018 15:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/LymsEncodeUtil.java | 4 ++-- .../platform/operate/web/facade/BabyCheckFacade.java | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 7a346d1..176ec9d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -24,9 +24,9 @@ public class LymsEncodeUtil { * String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); */ - String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); + //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); - String json = aesDecrypt("522E50C6944F903BCAAF46E5078F8A517CEC505DC2BA5ABA52E16CC7A5593909", key); + String json = aesDecrypt("2D982B3ACAE8CEB83B8090DA41309C3C05501035A518DD9D8C7C4832822E9C89FFD818C6E6F0BD7651D378FCF72BACD0", key); System.out.println("解密后：" + json); } 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 df243ef..4135824 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 @@ -1415,6 +1415,13 @@ public class BabyCheckFacade { public String getBabyHW(Double height, Double weight, Integer sex, String birth,String dueDate,String checkDate) { Double hw = getHw(height); + String res = ""; + if(StringUtils.isEmpty(birth) || StringUtils.isEmpty(checkDate)) + { + return res; + } + + int monthAge = 0; if (StringUtils.isNotEmpty(dueDate)) { @@ -1438,7 +1445,7 @@ public class BabyCheckFacade { //查询该月龄的年龄别体重值 List list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw); - String res = ""; + if (CollectionUtils.isNotEmpty(list)) { AwModel model = list.get(0); @@ -1531,6 +1538,12 @@ public class BabyCheckFacade { */ public List getBabyGrowthEvaluate(Double height, Integer sex, String birth, Double weight,String dueDate,String checkDate) { List growthEvaluate = new ArrayList<>(); + + if(StringUtils.isEmpty(birth) || StringUtils.isEmpty(checkDate)) + { + return growthEvaluate; + } + Double hw = getHw(height); int monthAge = 0; @@ -1665,6 +1678,7 @@ public class BabyCheckFacade { public BaseObjectResponse queryBabyHealthStatus(String birth, Double value, Integer sex, Integer type,String dueDate,String babyId, String checkDate) { String res = ""; + //体重 if (type == 0) { -- 1.8.3.1