jiangjiazhi / regional-platform

Commit 18f27aac15b866255b448d8230aee2e35e4ac836

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 35 additions and 17 deletions

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

...	...	@@ -1394,7 +1394,10 @@
1394	1394	}
1395	1395	base.setWeakSonInfo(weakSonInfos);//体弱儿详情
1396	1396	}
	1397	+ base.setWeakSon(model.getWeakSon());
1397	1398
	1399	+ base.setHighRiskInfo(model.getHighRiskInfo());
	1400	+
1398	1401	base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
1399	1402	base.setId(id);
1400	1403	base.setSex(model.getSex());
...	...	@@ -1513,6 +1516,8 @@
1513	1516	base.setServiceList(serTypeNameList);
1514	1517
1515	1518	base.setBabyDiagnosis(model.getBabyDiagnosis());
	1519	+
	1520	+
1516	1521	}
1517	1522	}
1518	1523	return model;

...	...	@@ -7,8 +7,8 @@
7	7	* Created by Administrator on 2016/6/20.
8	8	*/
9	9	public class BabyBasicResult {
10		- private List <Map> highRiskInfo;//儿童高危详情
11		- private List <Map> weakSonInfo;//体弱儿详情
	10	+ private List highRiskInfo;//儿童高危详情
	11	+ private List weakSonInfo;//体弱儿详情
12	12	private List<Map<String, Object>> mHighRiskReason;
13	13
14	14	public List<Map<String, Object>> getmHighRiskReason() {
...	...	@@ -101,6 +101,34 @@
101	101
102	102	private String babyDiagnosis;
103	103
	104	+
	105	+ //是否体弱 0 非高危 1高危
	106	+ private Integer weakSon;
	107	+
	108	+ public List getHighRiskInfo() {
	109	+ return highRiskInfo;
	110	+ }
	111	+
	112	+ public void setHighRiskInfo(List highRiskInfo) {
	113	+ this.highRiskInfo = highRiskInfo;
	114	+ }
	115	+
	116	+ public List getWeakSonInfo() {
	117	+ return weakSonInfo;
	118	+ }
	119	+
	120	+ public void setWeakSonInfo(List weakSonInfo) {
	121	+ this.weakSonInfo = weakSonInfo;
	122	+ }
	123	+
	124	+ public Integer getWeakSon() {
	125	+ return weakSon;
	126	+ }
	127	+
	128	+ public void setWeakSon(Integer weakSon) {
	129	+ this.weakSon = weakSon;
	130	+ }
	131	+
104	132	public String getBabyDiagnosis() {
105	133	return babyDiagnosis;
106	134	}
...	...	@@ -201,21 +229,6 @@
201	229	return correctValue;
202	230	}
203	231
204		- public List <Map> getHighRiskInfo() {
205		- return highRiskInfo;
206		- }
207		-
208		- public void setHighRiskInfo(List <Map> highRiskInfo) {
209		- this.highRiskInfo = highRiskInfo;
210		- }
211		-
212		- public List <Map> getWeakSonInfo() {
213		- return weakSonInfo;
214		- }
215		-
216		- public void setWeakSonInfo(List <Map> weakSonInfo) {
217		- this.weakSonInfo = weakSonInfo;
218		- }
219	232
220	233	public void setCorrectValue(String correctValue) {
221	234	this.correctValue = correctValue;