jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 8 deletions

...	...	@@ -1553,14 +1553,14 @@
1553	1553	base.setHighRiskInfo(highRiskInfos);//儿童高危详情
1554	1554	}
1555	1555
1556		- if(CollectionUtils.isNotEmpty(model.getWeakSonInfo())){
1557		- List <Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(model.getWeakSonInfo());
1558		- for (Map w : weakSonInfos) {
1559		- w.put("color", "risk_yellow");
1560		- }
1561		- base.setWeakSonInfo(weakSonInfos);//体弱儿详情
1562		- }
1563		- base.setWeakSon(model.getWeakSon());
	1556	+// if(CollectionUtils.isNotEmpty(model.getWeakSonInfo())){
	1557	+// List <Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(model.getWeakSonInfo());
	1558	+// for (Map w : weakSonInfos) {
	1559	+// w.put("color", "risk_yellow");
	1560	+// }
	1561	+// base.setWeakSonInfo(weakSonInfos);//体弱儿详情
	1562	+// }
	1563	+// base.setWeakSon(model.getWeakSon());
1564	1564	base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
1565	1565	base.setId(id);
1566	1566	base.setSex(model.getSex());
...	...	@@ -1682,6 +1682,7 @@
1682	1682	} else {
1683	1683	base.setHighRisk("");
1684	1684	}
	1685	+ base.setHighRisk("sss");
1685	1686	}
1686	1687
1687	1688	}

...	...	@@ -828,6 +828,10 @@
828	828	private BabyModel fillBaby(Patients patients, MatDeliverAddRequest deliverAddRequest) {
829	829	BabyModel babyModel = new BabyModel();
830	830	if (null != patients) {
	831	+
	832	+ //设置母亲高危因素到儿童档案
	833	+ babyModel.setmHighRiskReason(patients.getRiskFactorId());
	834	+
831	835	babyModel.setAreaId(patients.getAreaId());
832	836	babyModel.setProvinceId(patients.getProvinceId());
833	837	babyModel.setCityId(patients.getCityId());