jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 27 additions and 6 deletions

...	...	@@ -614,7 +614,7 @@
614	614	condition = condition.and("sieveType", sieveType, MongoOper.IS);
615	615	}
616	616
617		- if (StringUtils.isNotEmpty(costType)) {
	617	+ /*if (StringUtils.isNotEmpty(costType)) {
618	618	// costType = null/1 免费
619	619	if ("1".equals(costType)) {
620	620	MongoCondition c = MongoCondition.newInstance();
...	...	@@ -630,6 +630,10 @@
630	630	else {
631	631	condition = condition.and("costType", costType, MongoOper.IS);
632	632	}
	633	+ }*/
	634	+
	635	+ if (null != costType) {
	636	+ condition = condition.and("costType", costType, MongoOper.IS);
633	637	}
634	638
635	639	if (StringUtils.isNotEmpty(reportType)) {

...	...	@@ -2338,11 +2338,9 @@
2338	2338	babyQuery.setDataStatus(true);//排除自动建档数据
2339	2339	babyQuery.setYn(YnEnums.YES.getId());
2340	2340	babyQuery.setMphone(request.getMphone());//母亲联系方式
2341		- if (StringUtils.isNotEmpty(request.getBirth())) {//生日
2342		- String birthStr = request.getBirth();
2343		- String[] dates = birthStr.split(" - ");
2344		- babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
2345		- babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
	2341	+ if (StringUtils.isNotEmpty(request.getBirthStart()) && StringUtils.isNotEmpty(request.getBirthEnd())) {//生日
	2342	+ babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart()));
	2343	+ babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(request.getBirthEnd()).getTime() + 24 * 60 * 60 * 1000 - 1));
2346	2344	}
2347	2345	models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
2348	2346	//如果有高危儿多项就加一下

...	...	@@ -30,6 +30,9 @@
30	30	private String birth;
31	31	//下次预约时间
32	32	private String nextDate;
	33	+ //生日
	34	+ private String birthStart;
	35	+ private String birthEnd;
33	36	//结案时间
34	37	private String endCaseTime;
35	38	//母亲联系方式
...	...	@@ -93,6 +96,22 @@
93	96
94	97	//分娩医院
95	98	private String fmHospitalId;
	99	+
	100	+ public String getBirthStart() {
	101	+ return birthStart;
	102	+ }
	103	+
	104	+ public void setBirthStart(String birthStart) {
	105	+ this.birthStart = birthStart;
	106	+ }
	107	+
	108	+ public String getBirthEnd() {
	109	+ return birthEnd;
	110	+ }
	111	+
	112	+ public void setBirthEnd(String birthEnd) {
	113	+ this.birthEnd = birthEnd;
	114	+ }
96	115
97	116	public String getFmHospitalId() {
98	117	return fmHospitalId;