jiangjiazhi / regional-platform

Authored by jishenfei almost 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 15 additions and 4 deletions

...	...	@@ -2957,14 +2957,16 @@
2957	2957	if (CollectionUtils.isNotEmpty(futures)) {
2958	2958	for (Future f : futures) {
2959	2959	try {
2960		-
	2960	+ f.get();
2961	2961	childbirthManagerQueryModelList.addAll((List <ChildbirthManagerQueryModel>) f.get());
2962	2962	} catch (Exception e) {
2963	2963	ExceptionUtils.catchException(e, "fm list error.");
2964	2964	}
2965	2965	}
2966	2966	}
2967		-
	2967	+ for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){
	2968	+ result.setCreatedWeek(result.getQqybuild());
	2969	+ }
2968	2970	childbirthManagerResult.setData(childbirthManagerQueryModelList);
2969	2971	childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
2970	2972	childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);

...	...	@@ -682,7 +682,7 @@
682	682	initQueryMap.put("hivkt", "艾滋病检测结果");
683	683	initQueryMap.put("syjg", "梅毒检测结果");
684	684	initQueryMap.put("ygbmky", "乙肝检测结果");
685		- initQueryMap.put("qqybuild", "建档孕周");
	685	+ initQueryMap.put("createdWeek", "建档孕周");
686	686	initQueryMap.put("coupon", "优惠券发放");
687	687
688	688
...	...	@@ -839,7 +839,7 @@
839	839	areaQueryMap.put("hivkt", "艾滋病检测结果");
840	840	areaQueryMap.put("syjg", "梅毒检测结果");
841	841	areaQueryMap.put("ygbmky", "乙肝检测结果");
842		- areaQueryMap.put("qqybuild", "建档孕周");
	842	+ areaQueryMap.put("createdWeek", "建档孕周");
843	843	areaQueryMap.put("coupon", "优惠券发放");
844	844
845	845	Map<String, String> initQueryMapqhdky = new LinkedHashMap<>();

...	...	@@ -76,6 +76,7 @@
76	76	*/
77	77	private String buildWeek;
78	78	private String qqybuild;
	79	+ private String createdWeek;
79	80
80	81	/**
81	82	* @auther HuJiaqi
...	...	@@ -483,6 +484,14 @@
483	484
484	485	// 是否发放过优惠券
485	486	private String coupon;
	487	+
	488	+ public String getCreatedWeek() {
	489	+ return createdWeek;
	490	+ }
	491	+
	492	+ public void setCreatedWeek(String createdWeek) {
	493	+ this.createdWeek = createdWeek;
	494	+ }
486	495
487	496	public String getCoupon() {
488	497	return coupon;