jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 7 additions and 4 deletions

...	...	@@ -92,9 +92,6 @@
92	92	if(null != streetId){
93	93	condition=condition.and("streetId", streetId, MongoOper.IS);
94	94	}
95		- if(null != queryNo){
96		- condition=condition.and("queryNo", queryNo, MongoOper.IS);
97		- }
98	95	if(null != hospitalId){
99	96	condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
100	97	}

...	...	@@ -94,7 +94,11 @@
94	94	map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
95	95	map.put("sfZhzd",model.getSfZhzd());
96	96	map.put("sfJcry",model.getSfJcry() == null ? "" : model.getSfJcry());
97		- map.put("yxyj","");
	97	+
	98	+ map.put("sfZzjg",model.getSfZzjg());//检査机构
	99	+
	100	+ map.put("sfJcsj",DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
	101	+
98	102	list.add(map);
99	103	}
100	104	}
...	...	@@ -233,6 +237,8 @@
233	237	Map<String,Object> result = new HashMap<>();
234	238
235	239	result.put("userName",model.getUsername());
	240	+
	241	+ result.put("cardNo",model.getCertificateNum());
236	242
237	243	if (model.getBirthday() != null) {
238	244	result.put("age", com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model.getBirthday(), new Date()).toString(), UnitConstants.SUI));