jiangjiazhi / regional-platform

Authored by liquanyu almost 2 years ago

Exists in master and in 3 other branches

Showing 5 changed files with 71 additions and 0 deletions

...	...	@@ -41,6 +41,8 @@
41	41	private String uname;
42	42	//出生日期
43	43	private Date birthday;
	44	+ private Date birthdayStart;
	45	+ private Date birthdayEnd;
44	46	//民族Id
45	47	private String nationId;
46	48	//身份证件号
47	49
...	...	@@ -378,7 +380,15 @@
378	380	}
379	381	}
380	382
	383	+ if (null != birthdayStart && birthdayEnd != null) {
	384	+ if (null != c) {
	385	+ c = c.and("birthday").gte(birthdayStart).lte(birthdayEnd);
	386	+ } else {
	387	+ c = Criteria.where("birthday").gte(birthdayStart).lte(birthdayEnd);
	388	+ }
	389	+ }
381	390
	391	+
382	392	if(null != isFollow){
383	393	condition=condition.and("isLast", 2, MongoOper.IS);
384	394	Date currentDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date()));
385	395
...	...	@@ -431,7 +441,21 @@
431	441	return condition.toMongoQuery();
432	442	}
433	443
	444	+ public Date getBirthdayStart() {
	445	+ return birthdayStart;
	446	+ }
434	447
	448	+ public void setBirthdayStart(Date birthdayStart) {
	449	+ this.birthdayStart = birthdayStart;
	450	+ }
	451	+
	452	+ public Date getBirthdayEnd() {
	453	+ return birthdayEnd;
	454	+ }
	455	+
	456	+ public void setBirthdayEnd(Date birthdayEnd) {
	457	+ this.birthdayEnd = birthdayEnd;
	458	+ }
435	459
436	460	public String getZhzd() {
437	461	return zhzd;

...	...	@@ -351,6 +351,11 @@
351	351	query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(arrs[1])));
352	352	}
353	353
	354	+ if (queryRequest.getStartAge() != null && queryRequest.getEndAge() != null) {
	355	+ query.setBirthdayEnd(DateUtil.addYear(new Date(),-queryRequest.getStartAge()));
	356	+ query.setBirthdayStart(DateUtil.addYear(new Date(),-queryRequest.getEndAge()));
	357	+ }
	358	+
354	359	query.setLeftRight(queryRequest.getLeftRight());
355	360	query.setRxcsLevel(queryRequest.getRxcsLevel());
356	361	query.setRxxLevel(queryRequest.getRxxLevel());

...	...	@@ -103,6 +103,25 @@
103	103	private Integer yqDaysStart;
104	104	private Integer yqDaysEnd;
105	105
	106	+ private Integer startAge;
	107	+ private Integer endAge;
	108	+
	109	+ public Integer getStartAge() {
	110	+ return startAge;
	111	+ }
	112	+
	113	+ public void setStartAge(Integer startAge) {
	114	+ this.startAge = startAge;
	115	+ }
	116	+
	117	+ public Integer getEndAge() {
	118	+ return endAge;
	119	+ }
	120	+
	121	+ public void setEndAge(Integer endAge) {
	122	+ this.endAge = endAge;
	123	+ }
	124	+
106	125	public Integer getYqDaysStart() {
107	126	return yqDaysStart;
108	127	}

...	...	@@ -68,6 +68,25 @@
68	68	private Integer yqDaysStart;
69	69	private Integer yqDaysEnd;
70	70
	71	+ private Integer startAge;
	72	+ private Integer endAge;
	73	+
	74	+ public Integer getStartAge() {
	75	+ return startAge;
	76	+ }
	77	+
	78	+ public void setStartAge(Integer startAge) {
	79	+ this.startAge = startAge;
	80	+ }
	81	+
	82	+ public Integer getEndAge() {
	83	+ return endAge;
	84	+ }
	85	+
	86	+ public void setEndAge(Integer endAge) {
	87	+ this.endAge = endAge;
	88	+ }
	89	+
71	90	public Integer getYqDaysStart() {
72	91	return yqDaysStart;
73	92	}

...	...	@@ -264,6 +264,10 @@
264	264	query.addCriteria(Criteria.where("checkPackage").is(checkPackage));
265	265	}
266	266
	267	+ if (null!=param.getStartAge() && param.getEndAge() != null) {
	268	+ query.addCriteria(Criteria.where("age").gte(param.getStartAge()).lte(param.getEndAge()));
	269	+ }
	270	+
267	271	/20201021 wtt 陵城需求 start /
268	272	String fklcjczd = param.getFklcjczd();//妇科检查临床诊断异常项
269	273	if(StringUtils.isNotEmpty(hospitalId)&&"2100001605".equals(hospitalId)){//隆化需求（前端存的数据格式是数组true和false）