jiangjiazhi / regional-platform

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 21 additions and 20 deletions

...	...	@@ -54,8 +54,8 @@
54	54	PatientsQuery patientsQuery = new PatientsQuery();
55	55	patientsQuery.setType(2);
56	56	patientsQuery.setYn(YnEnums.YES.getId());
57		- patientsQuery.setBirthEnd(babyManagerRequest.getdEnd());
58		- patientsQuery.setBirthStart(babyManagerRequest.getdStart());
	57	+ patientsQuery.setBirthEnd(DateUtil.parseYMD(babyManagerRequest.getdEnd()));
	58	+ patientsQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart()));
59	59	patientsQuery.setVisitstatus(babyManagerRequest.getVisitstatus());
60	60	patientsQuery.setPage(babyManagerRequest.getPage());
61	61	patientsQuery.setLimit(babyManagerRequest.getLimit());

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.common.result.BaseListResponse;
8	8	import com.lyms.platform.common.result.BaseResponse;
9	9	import com.lyms.platform.common.utils.Assert;
	10	+import com.lyms.platform.common.utils.DateUtil;
10	11	import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
11	12	import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
12	13	import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
...	...	@@ -71,8 +72,8 @@
71	72	PuerperaModelQuery puerperaQuery = new PuerperaModelQuery();
72	73	puerperaQuery.setLimit(managerRequest.getLimit());
73	74	puerperaQuery.setPage(managerRequest.getPage());
74		- puerperaQuery.setDueDateEnd(managerRequest.getDueDateEnd());
75		- puerperaQuery.setDueDateStart(managerRequest.getDueDateStart());
	75	+ puerperaQuery.setDueDateEnd(DateUtil.parseYMD(managerRequest.getDueDateEnd()));
	76	+ puerperaQuery.setDueDateStart(DateUtil.parseYMD(managerRequest.getDueDateStart()));
76	77	puerperaQuery.setKeyword(managerRequest.getKeyword());
77	78	puerperaQuery.setCommunityId(managerRequest.getCommunityId());
78	79	puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());

...	...	@@ -34,13 +34,13 @@
34	34	* 生日开始
35	35	*/
36	36	@FormParam("dstart")
37		- private Date dStart;
	37	+ private String dStart;
38	38
39	39	/**
40	40	* 生日结束
41	41	*/
42	42	@FormParam("dend")
43		- private Date dEnd;
	43	+ private String dEnd;
44	44
45	45	public String getKeyword() {
46	46	return keyword;
47	47
48	48
49	49
...	...	@@ -58,20 +58,20 @@
58	58	this.visitstatus = visitstatus;
59	59	}
60	60
61		- public Date getdStart() {
	61	+ public String getdStart() {
62	62	return dStart;
63	63	}
64	64
65		- public void setdStart(long dStart) {
66		- this.dStart = new Date(dStart * 1000);
	65	+ public void setdStart(String dStart) {
	66	+ this.dStart = dStart;
67	67	}
68	68
69		- public Date getdEnd() {
	69	+ public String getdEnd() {
70	70	return dEnd;
71	71	}
72	72
73		- public void setdEnd(long dEnd) {
74		- this.dEnd = new Date(dEnd * 1000);
	73	+ public void setdEnd(String dEnd) {
	74	+ this.dEnd = dEnd;
75	75	}
76	76
77	77	public void setPage(int page) {

...	...	@@ -40,13 +40,13 @@
40	40	* 分娩日期开始
41	41	*/
42	42	@FormParam("duedatestart")
43		- private Date dueDateStart;
	43	+ private String dueDateStart;
44	44
45	45	/**
46	46	* 分娩日期结束
47	47	*/
48	48	@FormParam("duedateend")
49		- private Date dueDateEnd;
	49	+ private String dueDateEnd;
50	50
51	51	public String getCommunityId() {
52	52	return communityId;
53	53
54	54
55	55
...	...	@@ -72,20 +72,20 @@
72	72	this.visitstatus = visitstatus;
73	73	}
74	74
75		- public Date getDueDateStart() {
	75	+ public String getDueDateStart() {
76	76	return dueDateStart;
77	77	}
78	78
79		- public void setDueDateStart(long dueDateStart) {
80		- this.dueDateStart = new Date(dueDateStart * 1000);
	79	+ public void setDueDateStart(String dueDateStart) {
	80	+ this.dueDateStart =dueDateStart;
81	81	}
82	82
83		- public Date getDueDateEnd() {
	83	+ public String getDueDateEnd() {
84	84	return dueDateEnd;
85	85	}
86	86
87		- public void setDueDateEnd(long dueDateEnd) {
88		- this.dueDateEnd = new Date(dueDateEnd * 1000);
	87	+ public void setDueDateEnd(String dueDateEnd) {
	88	+ this.dueDateEnd = dueDateEnd;
89	89	}
90	90	}