jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 17 additions and 2 deletions

...	...	@@ -269,7 +269,7 @@
269	269	highRiskSmsModel.setModified(new Date());
270	270	highRiskService.addHighRiskSmsModel(highRiskSmsModel);
271	271
272		- String name = String.valueOf(riskMap.get("id"));
	272	+ String name = String.valueOf(riskMap.get("name"));
273	273	List<MessageContent> messageContents = amsSmses.get(name);
274	274	if (CollectionUtils.isNotEmpty(messageContents))
275	275	{

...	...	@@ -758,7 +758,7 @@
758	758	data.put("dueWeek",orderModel.getDueWeek());
759	759	data.put("cDueWeek", orderModel.getcDueWeek());
760	760	data.put("dueDate", orderModel.getDueDate());
761		- data.put("rLevel", orderModel.getrLevel());
	761	+ data.put("rLevel", getLevel(orderModel.getrLevel()));
762	762	data.put("rRisk", orderModel.getrRisk());
763	763	data.put("score",orderModel.getScore());
764	764	data.put("transferredDisease",orderModel.getTransferredDisease());
...	...	@@ -913,6 +913,21 @@
913	913	} catch (IOException e) {
914	914	e.printStackTrace();
915	915	}
	916	+ }
	917	+
	918	+ private String getLevel(List<Map> levels)
	919	+ {
	920	+
	921	+ String str = "";
	922	+ if (CollectionUtils.isNotEmpty(levels))
	923	+ {
	924	+ for (Map map : levels)
	925	+ {
	926	+ str+=map.get("name")+";";
	927	+ }
	928	+ }
	929	+
	930	+ return str;
916	931	}
917	932	}