jiangjiazhi / regional-platform

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Showing 5 changed files with 57 additions and 10 deletions

...	...	@@ -199,6 +199,9 @@
199	199	if(null!=phone){
200	200	condition=condition.and("phone", phone, MongoOper.IS);
201	201	}
	202	+ if(null!=name){
	203	+ condition=condition.and("username", name, MongoOper.IS);
	204	+ }
202	205	if(-1!=yn){
203	206	condition=condition.and("yn", yn, MongoOper.IS);
204	207	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3		-import java.util.ArrayList;
4		-import java.util.HashMap;
5		-import java.util.List;
6		-import java.util.Map;
	3	+import java.util.*;
7	4
8	5	import com.lyms.platform.biz.service.*;
9	6	import com.lyms.platform.common.utils.DateUtil;
10	7
...	...	@@ -54,8 +51,15 @@
54	51	PatientsQuery patientsQuery = new PatientsQuery();
55	52	patientsQuery.setType(2);
56	53	patientsQuery.setYn(YnEnums.YES.getId());
57		- patientsQuery.setBirthEnd(DateUtil.parseYMD(babyManagerRequest.getdEnd()));
	54	+ Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd());
	55	+ if (null != date) {
	56	+ long d = date.getTime() + 86398000;
	57	+ date = new Date(d);
	58	+ }
	59	+ patientsQuery.setBirthEnd(date);
58	60	patientsQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart()));
	61	+ patientsQuery.setPhone(babyManagerRequest.getPhone());
	62	+ patientsQuery.setName(babyManagerRequest.getName());
59	63	patientsQuery.setVisitstatus(babyManagerRequest.getVisitstatus());
60	64	patientsQuery.setPage(babyManagerRequest.getPage());
61	65	patientsQuery.setLimit(babyManagerRequest.getLimit());

...	...	@@ -80,6 +80,8 @@
80	80	long d = date.getTime() + 86398000;
81	81	date = new Date(d);
82	82	}
	83	+ puerperaQuery.setName(managerRequest.getName());
	84	+ puerperaQuery.setPhone(managerRequest.getPhone());
83	85	puerperaQuery.setDueDateEnd(date);
84	86	puerperaQuery.setDueDateStart(DateUtil.parseYMD(managerRequest.getDueDateStart()));
85	87	puerperaQuery.setKeyword(managerRequest.getKeyword());

...	...	@@ -23,6 +23,26 @@
23	23	*/
24	24	@FormParam("keywords")
25	25	private String keyword;
	26	+ @FormParam
	27	+ private String phone;
	28	+ @FormParam
	29	+ private String name;
	30	+
	31	+ public String getName() {
	32	+ return name;
	33	+ }
	34	+
	35	+ public void setName(String name) {
	36	+ this.name = name;
	37	+ }
	38	+
	39	+ public String getPhone() {
	40	+ return phone;
	41	+ }
	42	+
	43	+ public void setPhone(String phone) {
	44	+ this.phone = phone;
	45	+ }
26	46
27	47	/**
28	48	* 访视状态

1	1	package com.lyms.platform.operate.web.request;
2	2
3		-import java.util.Date;
4		-
5	3	import com.lyms.platform.common.core.annotation.form.Form;
6	4	import com.lyms.platform.common.core.annotation.form.FormParam;
7	5
8	6	/**
9	7	* 产妇管理请求
10		- *
	8	+ *
11	9	* @author Administrator
12	10	*/
13	11	@Form
14	12	public class PuerperaManagerQueryRequest extends BasePageQueryRequest {
15	13
16	14	/**
17		- *
	15	+ *
18	16	*/
19	17	private static final long serialVersionUID = 1L;
20	18
21	19
...	...	@@ -23,7 +21,27 @@
23	21	*/
24	22	@FormParam("keywords")
25	23	private String keyword;
	24	+ @FormParam
	25	+ private String phone;
	26	+ @FormParam
	27	+ private String name;
26	28
	29	+ public String getName() {
	30	+ return name;
	31	+ }
	32	+
	33	+ public void setName(String name) {
	34	+ this.name = name;
	35	+ }
	36	+
	37	+ public String getPhone() {
	38	+ return phone;
	39	+ }
	40	+
	41	+ public void setPhone(String phone) {
	42	+ this.phone = phone;
	43	+ }
	44	+
27	45	/**
28	46	* 社区名称
29	47	*/
...	...	@@ -77,7 +95,7 @@
77	95	}
78	96
79	97	public void setDueDateStart(String dueDateStart) {
80		- this.dueDateStart =dueDateStart;
	98	+ this.dueDateStart = dueDateStart;
81	99	}
82	100
83	101	public String getDueDateEnd() {