jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 14 additions and 1 deletions

...	...	@@ -1658,8 +1658,15 @@
1658	1658	//获取新生儿信息
1659	1659	List <MaternalDeliverModel.Baby> babyIdList = deliverModel.getBaby();
1660	1660	List babyList = new ArrayList();
	1661	+ Organization org = organizationService.getOrganization(Integer.valueOf(deliverModel.getHospitalId()));
1661	1662	if (CollectionUtils.isNotEmpty(babyIdList)) {
1662	1663	for (MaternalDeliverModel.Baby baby : babyIdList) {
	1664	+ //衡水城市限制
	1665	+ if(org!=null && "12".equals(org.getCityId())){
	1666	+ if("健康".equals(baby.getBabyHealthy())){
	1667	+ baby.setBabyHealthy("良好");
	1668	+ }
	1669	+ }
1663	1670	babyList.add(maternalDeliverResult.new Baby(baby));
1664	1671	}
1665	1672	}

...	...	@@ -4136,7 +4136,7 @@
4136	4136	//新生儿信息
4137	4137
4138	4138	List <Map <String, Object>> babyList = new ArrayList <>();
4139		-
	4139	+ Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
4140	4140	if (CollectionUtils.isNotEmpty(data.getBaby())) {
4141	4141	for (MaternalDeliverModel.Baby temp : data.getBaby()) {
4142	4142	Map <String, Object> babyMap = new HashMap <>();
...	...	@@ -4199,6 +4199,12 @@
4199	4199
4200	4200	babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G));
4201	4201	babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM));
	4202	+ //衡水城市限制
	4203	+ if(org!=null && "12".equals(org.getCityId())){
	4204	+ if("健康".equals(temp.getBabyHealthy())){
	4205	+ temp.setBabyHealthy("良好");
	4206	+ }
	4207	+ }
4202	4208	babyMap.put("babyHealthy", temp.getBabyHealthy());
4203	4209	babyMap.put("apgarScoreMap", temp.getApgarScore());
4204	4210	String apgarScorePf1 = "";