jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 48 additions and 2 deletions

...	...	@@ -25,6 +25,9 @@
25	25	//出生日期
26	26	private Date birthdayStart;
27	27	private Date birthdayEnd;
	28	+ //建档时间
	29	+ private Date buildDateStart;
	30	+ private Date buildDateEnd;
28	31	//国籍
29	32	private String countryId;
30	33	//民族Id
...	...	@@ -208,6 +211,15 @@
208	211	c1 = c1.lte(birthdayEnd);
209	212	}
210	213	}
	214	+
	215	+ if (null != buildDateStart && null != buildDateEnd) {
	216	+ if (null != c1) {
	217	+ c1 = c1.where("buildDay").gte(buildDateStart).lte(buildDateEnd);
	218	+ } else {
	219	+ c1 = Criteria.where("buildDay").gte(buildDateStart).lte(buildDateEnd);
	220	+ }
	221	+ }
	222	+
211	223	if (null != ageMin) {
212	224	c1 = Criteria.where("age").gte(ageMin);
213	225	}
...	...	@@ -630,6 +642,22 @@
630	642
631	643	public void setPublishName(String publishName) {
632	644	this.publishName = publishName;
	645	+ }
	646	+
	647	+ public Date getBuildDateStart() {
	648	+ return buildDateStart;
	649	+ }
	650	+
	651	+ public void setBuildDateStart(Date buildDateStart) {
	652	+ this.buildDateStart = buildDateStart;
	653	+ }
	654	+
	655	+ public Date getBuildDateEnd() {
	656	+ return buildDateEnd;
	657	+ }
	658	+
	659	+ public void setBuildDateEnd(Date buildDateEnd) {
	660	+ this.buildDateEnd = buildDateEnd;
633	661	}
634	662	}

...	...	@@ -914,7 +914,7 @@
914	914	if(-1 == dex){
915	915	continue;
916	916	}
917		- String name = fileName.substring(dex-5,dex);
	917	+ String name = fileName.substring(dex-4,dex);
918	918	//读文件
919	919	List<String> list = FileUtils.readLines(new File(fileName));
920	920	//文件的名称有两种一种是NTSHS.，另一种是PKUH.，判断名称分类字段数据保存

...	...	@@ -439,7 +439,7 @@
439	439	}
440	440	}
441	441
442		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	442	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
443	443	}
444	444
445	445
...	...	@@ -610,6 +610,14 @@
610	610	query.setQueryNo(queryRequest.getQueryNo());
611	611	if (hospitalId!=null){
612	612	query.setHospitalId(hospitalId);
	613	+ }
	614	+ if(StringUtils.isNotEmpty(queryRequest.getBuildDate())){
	615	+ try {
	616	+ query.setBuildDateStart(DateUtil.getSNDate(queryRequest.getBuildDate())[0]);
	617	+ query.setBuildDateEnd(DateUtil.getSNDate(queryRequest.getBuildDate())[1]);
	618	+ } catch (Exception e) {
	619	+ e.printStackTrace();
	620	+ }
613	621	}
614	622
615	623	//只查询女性

...	...	@@ -53,6 +53,16 @@
53	53	private String queryNo;
54	54	//1-需要隐藏姓名、电话、地址
55	55	private int showDetail;
	56	+ //建档时间
	57	+ private String buildDate;
	58	+
	59	+ public String getBuildDate() {
	60	+ return buildDate;
	61	+ }
	62	+
	63	+ public void setBuildDate(String buildDate) {
	64	+ this.buildDate = buildDate;
	65	+ }
56	66
57	67	public int getShowDetail() {
58	68	return showDetail;