jiangjiazhi / regional-platform

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 13 deletions

...	...	@@ -106,6 +106,12 @@
106	106	} else {
107	107
108	108	sieveService.addSieve(sieveResultModel);
	109	+
	110	+ if (StringUtils.isNotEmpty(sieveResultModel.getExamineId()) && StringUtils.isNotEmpty(sieveResultModel.getCheckerId()) )
	111	+ {
	112	+ createSieveSms(sieveResultModel.getParentId());
	113	+ }
	114	+
109	115	operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产筛结果");
110	116	}
111	117
...	...	@@ -146,12 +152,6 @@
146	152
147	153	//短信前缀
148	154	String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, patient.getLastCheckEmployeeId(), ServiceObjEnums.YUNOBJ.getId());
149		-
150		- //发送推送类模板建档
151		- if (startType == 3)
152		- {
153		- return;
154		- }
155	155
156	156	List<MsgRequest> messages = new ArrayList<>();
157	157	MsgRequest mr = new MsgRequest();

...	...	@@ -1265,14 +1265,14 @@
1265	1265	Map<Integer, Double> lowMap = new LinkedHashMap<>();
1266	1266	List<Integer> xAxis = new ArrayList<>();
1267	1267
1268		- double avg = low / 12;
	1268	+ double avg = Double.valueOf(String.format("%.2f", low / 12));
1269	1269	for (int i = 1; i <= 12; i++) {
1270		- lowMap.put(i, i * avg);
	1270	+ lowMap.put(i, Double.valueOf(String.format("%.2f",i * avg)));
1271	1271	}
1272	1272
1273		- double highAvg = high / 12;
	1273	+ double highAvg = Double.valueOf(String.format("%.2f",high / 12));
1274	1274	for (int i = 1; i <= 12; i++) {
1275		- highMap.put(i, i * highAvg);
	1275	+ highMap.put(i, Double.valueOf(String.format("%.2f",i * highAvg)));
1276	1276	}
1277	1277
1278	1278	for (int i = 13; i <= 40; i++) {
1279	1279
...	...	@@ -1291,13 +1291,13 @@
1291	1291	if (StringUtils.isNotEmpty(range))
1292	1292	{
1293	1293	String[] array = range.split("-");
1294		- lowMap.put(i, Double.parseDouble(array[0]));
1295		- highMap.put(i, Double.parseDouble(array[1]));
	1294	+ lowMap.put(i, Double.valueOf(String.format("%.2f", Double.valueOf(array[0]))));
	1295	+ highMap.put(i, Double.valueOf(String.format("%.2f", Double.valueOf(array[1]))));
1296	1296	}
1297	1297	}
1298	1298
1299	1299	for (int i = 1; i <= 40; i++) {
1300		- normalMap.put(i, (highMap.get(i) + lowMap.get(i)) / 2);
	1300	+ normalMap.put(i, Double.valueOf(String.format("%.2f", (highMap.get(i) + lowMap.get(i)) / 2)) );
1301	1301	}
1302	1302
1303	1303	Map<String, Object> reportModel = new LinkedHashMap<>();