jiangjiazhi / regional-platform

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 10 additions and 5 deletions

...	...	@@ -109,12 +109,17 @@
109	109	recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
110	110	recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
111	111	recordMap.put("id", folviteRecordModel.getId());
112		- recordMap.put("other", folviteRecordModel.getIsconceive());
113		- if (folviteRecordModel.getIsconceive() == 0) {
114		- recordMap.put("pregnancyType", "孕前");
115		- } else {
116		- recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
	112	+ recordMap.put("other", null!=folviteRecordModel.getIsconceive()?folviteRecordModel.getIsconceive():"");
	113	+ if (null!=folviteRecordModel.getIsconceive()) {
	114	+ if (folviteRecordModel.getIsconceive() == 0) {
	115	+ recordMap.put("pregnancyType", "孕前");
	116	+ } else {
	117	+ recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
	118	+ }
	119	+ }else {
	120	+ recordMap.put("pregnancyType", "");
117	121	}
	122	+
118	123	listMap.add(recordMap);
119	124	}
120	125	}