jiangjiazhi / regional-platform

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 17 additions and 3 deletions

...	...	@@ -24,9 +24,9 @@
24	24	* String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
25	25	*/
26	26
27		- String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
	27	+ //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28	28
29		- String json = aesDecrypt("522E50C6944F903BCAAF46E5078F8A517CEC505DC2BA5ABA52E16CC7A5593909", key);
	29	+ String json = aesDecrypt("2D982B3ACAE8CEB83B8090DA41309C3C05501035A518DD9D8C7C4832822E9C89FFD818C6E6F0BD7651D378FCF72BACD0", key);
30	30	System.out.println("解密后：" + json);
31	31
32	32	}

...	...	@@ -1415,6 +1415,13 @@
1415	1415	public String getBabyHW(Double height, Double weight, Integer sex, String birth,String dueDate,String checkDate) {
1416	1416	Double hw = getHw(height);
1417	1417
	1418	+ String res = "";
	1419	+ if(StringUtils.isEmpty(birth) \|\| StringUtils.isEmpty(checkDate))
	1420	+ {
	1421	+ return res;
	1422	+ }
	1423	+
	1424	+
1418	1425	int monthAge = 0;
1419	1426	if (StringUtils.isNotEmpty(dueDate))
1420	1427	{
...	...	@@ -1438,7 +1445,7 @@
1438	1445	//查询该月龄的年龄别体重值
1439	1446	List<AwModel> list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw);
1440	1447
1441		- String res = "";
	1448	+
1442	1449	if (CollectionUtils.isNotEmpty(list)) {
1443	1450	AwModel model = list.get(0);
1444	1451
...	...	@@ -1531,6 +1538,12 @@
1531	1538	*/
1532	1539	public List<String> getBabyGrowthEvaluate(Double height, Integer sex, String birth, Double weight,String dueDate,String checkDate) {
1533	1540	List<String> growthEvaluate = new ArrayList<>();
	1541	+
	1542	+ if(StringUtils.isEmpty(birth) \|\| StringUtils.isEmpty(checkDate))
	1543	+ {
	1544	+ return growthEvaluate;
	1545	+ }
	1546	+
1534	1547	Double hw = getHw(height);
1535	1548
1536	1549	int monthAge = 0;
...	...	@@ -1665,6 +1678,7 @@
1665	1678	public BaseObjectResponse queryBabyHealthStatus(String birth, Double value, Integer sex, Integer type,String dueDate,String babyId,
1666	1679	String checkDate) {
1667	1680	String res = "";
	1681	+
1668	1682	//体重
1669	1683	if (type == 0)
1670	1684	{