jiangjiazhi / regional-platform

Commit 9e82cbe0174dd15721520ed88a3f455c2d375156

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 1 changed file with 10 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java

...	...	@@ -43,6 +43,7 @@
43	43	import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
44	44	import org.springframework.stereotype.Component;
45	45
	46	+import javax.validation.constraints.Max;
46	47	import java.util.*;
47	48	import java.util.concurrent.Callable;
48	49	import java.util.concurrent.Future;
...	...	@@ -1026,8 +1027,13 @@
1026	1027
1027	1028	getBabyCheckList(buildIds, personModels.get(0), list);
1028	1029	}
1029		- //其它高危
1030		- base.setWcOtherHighRisk(StringUtils.isNotEmpty(model.getWcOtherHighRisk())?model.getWcOtherHighRisk():null);
	1030	+ //其它高危数据流转儿保检查
	1031	+ if(CollectionUtils.isNotEmpty(list)){
	1032	+ base.setWcOtherHighRisk(StringUtils.isNotEmpty(list.get(list.size()-1).get("wcOtherHighRisk"))?list.get(list.size()-1).get("wcOtherHighRisk"):null);
	1033	+ }else {
	1034	+ base.setWcOtherHighRisk(StringUtils.isNotEmpty(model.getWcOtherHighRisk())?model.getWcOtherHighRisk():null);
	1035	+ }
	1036	+
1031	1037	resMap.put("baseInfo", base);
1032	1038	resMap.put("checkList", list);
1033	1039
...	...	@@ -1339,7 +1345,6 @@
1339	1345	//查询儿童的基本信息
1340	1346	List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1341	1347
1342		-
1343	1348	Map <String, String> checkRecord = new HashMap <>();
1344	1349	Date checkDate = cmodel.getCheckDate();
1345	1350	String monthAge = "";
...	...	@@ -1365,6 +1370,8 @@
1365	1370	} else {
1366	1371	checkRecord.put("hospitalName", "");
1367	1372	}
	1373	+ //获取每次检查的其它高危详情
	1374	+ checkRecord.put("wcOtherHighRisk",StringUtils.isNotEmpty(cmodel.getWcOtherHighRisk())?cmodel.getWcOtherHighRisk():null);
1368	1375	list.add(checkRecord);
1369	1376	}
1370	1377