jiangjiazhi / regional-platform

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 1 additions and 7 deletions

...	...	@@ -7,10 +7,7 @@
7	7	import com.lyms.hospitalapi.lhxfy.LhxfyZjkService;
8	8	import com.lyms.hospitalapi.qhdfy.QhdfyFmService;
9	9	import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
10		-//import com.lyms.hospitalapi.qhdfy.QhdfyZyFmService;
11	10	import com.lyms.hospitalapi.qhdfy.SyncQhdBaseInfoService;
12		-import com.lyms.hospitalapi.rcfy.RcGlxtService;
13		-import com.lyms.hospitalapi.zcfy.ZcPrenatalService;
14	11	import com.lyms.platform.biz.JdbcUtil;
15	12	import com.lyms.platform.biz.service.*;
16	13	import com.lyms.platform.common.annotation.TokenRequired;
17	14
...	...	@@ -52,14 +49,11 @@
52	49	import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
53	50	import org.springframework.stereotype.Controller;
54	51	import org.springframework.web.bind.annotation.*;
55		-import sun.misc.BASE64Encoder;
56	52
57	53	import javax.servlet.http.HttpServletRequest;
58	54	import javax.servlet.http.HttpServletResponse;
59	55	import javax.validation.Valid;
60	56	import java.io.*;
61		-import java.net.HttpURLConnection;
62		-import java.net.URL;
63	57	import java.util.*;
64	58	import java.util.regex.Pattern;
65	59

...	...	@@ -605,7 +605,7 @@
605	605	Map<String, Object> data = new HashMap<>();
606	606	data.put("name", result.getUsername());
607	607	data.put("cardNo", result.getCardNo());
608		- data.put("age", DateUtil.getAge(result.getBirth(),result.getSendDate()));
	608	+ data.put("age", DateUtil.getAge2(result.getBirth(),new Date()));
609	609	data.put("phone", result.getPhone());
610	610	data.put("address", result.getAddressRegisterStr());
611	611	data.put("applyDate", DateUtil.getyyyy_MM_dd(result.getSendDate()));