jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 5 additions and 2 deletions

...	...	@@ -93,7 +93,7 @@
93	93	public void autoInLis()
94	94	{
95	95	Query query = new Query();
96		- Date start = DateUtil.addDay(new Date(),-4);
	96	+ Date start = DateUtil.addDay(new Date(),-10);
97	97	query.addCriteria(Criteria.where("fillDate").gte(start));
98	98
99	99	List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
...	...	@@ -652,7 +652,7 @@
652	652	Map<String,String> data = new HashMap<>();
653	653
654	654	Query query = new Query();
655		- Date start = DateUtil.addDay(new Date(),-4);
	655	+ Date start = DateUtil.addDay(new Date(),-10);
656	656	query.addCriteria(Criteria.where("fillDate").gte(start));
657	657
658	658	List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);

...	...	@@ -1081,6 +1081,7 @@
1081	1081	dataWife.put("sex","女");
1082	1082	dataWife.put("phone",result.getWifePhone());
1083	1083	dataWife.put("cxNum",result.getWifeCxNum());
	1084	+ dataWife.put("blNum",result.getWifeBlNum());
1084	1085	dataWife.put("age",result.getWifeAge());
1085	1086	dataWife.put("currentAddressStr",result.getWifeCurrentAddressStr());
1086	1087
...	...	@@ -1090,6 +1091,7 @@
1090	1091	dataHusband.put("sex","男");
1091	1092	dataHusband.put("phone",result.getHusbandPhone());
1092	1093	dataHusband.put("cxNum",result.getHusbandCxNum());
	1094	+ dataHusband.put("blNum",result.getHusbandBlNum());
1093	1095	dataHusband.put("age",result.getHusbandAge());
1094	1096	dataHusband.put("currentAddressStr",result.getHusbandCurrentAddressStr());
1095	1097	datas.add(dataWife);
...	...	@@ -1102,6 +1104,7 @@
1102	1104	cnames.put("sex", "性别");
1103	1105	cnames.put("phone", "联系电话");
1104	1106	cnames.put("cxNum", "采血编号");
	1107	+ cnames.put("blNum", "病历号");
1105	1108	cnames.put("age", "年龄");
1106	1109	cnames.put("currentAddressStr", "地址");
1107	1110	ResponseUtil.responseExcel(cnames, datas, response);