jiangjiazhi / regional-platform

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 14 additions and 1 deletions

...	...	@@ -109,6 +109,7 @@
109	109	for(BabyModel babyModel:models){
110	110	Map<String, String> checkRecord = new HashMap<>();
111	111	checkRecord.put("id", babyModel.getId());
	112	+ checkRecord.put("pid",babyModel.getPid());
112	113	checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()));
113	114	String monthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate());
114	115	checkRecord.put("monthAge", monthAge);
...	...	@@ -1034,6 +1035,7 @@
1034	1035	puerperaQuery.setCardNo(model.getMcertNo());
1035	1036
1036	1037	BabyInfoResult result = new BabyInfoResult();
	1038	+
1037	1039	result.setPid(model.getPid());
1038	1040	result.setCardNo(model.getMcertNo());//母亲的身份证号码
1039	1041	result.setName(model.getName());

...	...	@@ -249,7 +249,7 @@
249	249	{
250	250	monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate);
251	251	}
252		-
	252	+ checkRecord.put("parentId",cmodel.getBuildId());
253	253	checkRecord.put("id", cmodel.getId());
254	254	checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate));
255	255	checkRecord.put("monthAge", monthAge);

...	...	@@ -12,9 +12,19 @@
12	12	private String name;
13	13	private String monthAge;
14	14	private String cardNo;
	15	+ private String id;
15	16
16	17
17	18	private List<Map<String,String>> buildRecords;
	19	+
	20	+
	21	+ public String getId() {
	22	+ return id;
	23	+ }
	24	+
	25	+ public void setId(String id) {
	26	+ this.id = id;
	27	+ }
18	28
19	29	public List<Map<String, String>> getBuildRecords() {
20	30	return buildRecords;