jiangjiazhi / regional-platform

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 62 additions and 1 deletions

...	...	@@ -276,6 +276,14 @@
276	276	patientsQueryRequest.setStartDueWeek(null);
277	277	patientsQueryRequest.setEndDueWeek(null);
278	278
	279	+ patientsQueryRequest.setFmTime(patientsQueryRequest.getBuildTime());
	280	+ patientsQueryRequest.setBuildTime(null);
	281	+
	282	+ patientsQueryRequest.setFmStartAge(patientsQueryRequest.getStartAge());
	283	+ patientsQueryRequest.setFmEndAge(patientsQueryRequest.getEndAge());
	284	+ patientsQueryRequest.setStartAge(null);
	285	+ patientsQueryRequest.setEndAge(null);
	286	+
279	287	return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE);
280	288	}
281	289

...	...	@@ -499,7 +499,18 @@
499	499	patientsQuery.setFmDateStart(end);
500	500	}
501	501
	502	+ if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmTime())) {
502	503
	504	+ String fmTime = riskPatientsQueryRequest.getFmTime();
	505	+ String[] dates = fmTime.split(" - ");
	506	+
	507	+ patientsQuery.setFmDateStart(DateUtil.parseYMD(dates[0]));
	508	+ if (dates.length == 2) {
	509	+ patientsQuery.setFmDateEnd(DateUtil.parseYMDHMS(dates[1]+" 23:59:59"));
	510	+ }
	511	+ }
	512	+
	513	+
503	514	if (riskPatientsQueryRequest.getFmWeekStart() != null)
504	515	{
505	516	int start = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekStart(), 0)*7;
506	517
...	...	@@ -509,8 +520,18 @@
509	520	if (riskPatientsQueryRequest.getFmWeekEnd() != null)
510	521	{
511	522	int end = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekEnd(), 0)+1;
512		- end = end * 7 - 1;
	523	+ end = 7;
513	524	patientsQuery.setFmWeekEnd(end);
	525	+ }
	526	+
	527	+ if (riskPatientsQueryRequest.getFmStartAge() != null)
	528	+ {
	529	+ patientsQuery.setFmAgeStart(riskPatientsQueryRequest.getFmStartAge());
	530	+ }
	531	+
	532	+ if (riskPatientsQueryRequest.getFmEndAge() != null)
	533	+ {
	534	+ patientsQuery.setFmAgeEnd(riskPatientsQueryRequest.getFmEndAge());
514	535	}
515	536
516	537

...	...	@@ -134,6 +134,38 @@
134	134	private String fmWeekStart;
135	135	private String fmWeekEnd;
136	136
	137	+ //分娩日期
	138	+ private String fmTime;
	139	+
	140	+ public String getFmTime() {
	141	+ return fmTime;
	142	+ }
	143	+
	144	+ public void setFmTime(String fmTime) {
	145	+ this.fmTime = fmTime;
	146	+ }
	147	+
	148	+
	149	+ //分娩年龄
	150	+ private Integer fmStartAge;
	151	+ private Integer fmEndAge;
	152	+
	153	+ public Integer getFmStartAge() {
	154	+ return fmStartAge;
	155	+ }
	156	+
	157	+ public void setFmStartAge(Integer fmStartAge) {
	158	+ this.fmStartAge = fmStartAge;
	159	+ }
	160	+
	161	+ public Integer getFmEndAge() {
	162	+ return fmEndAge;
	163	+ }
	164	+
	165	+ public void setFmEndAge(Integer fmEndAge) {
	166	+ this.fmEndAge = fmEndAge;
	167	+ }
	168	+
137	169	public String getFmWeekStart() {
138	170	return fmWeekStart;
139	171	}