jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 38 additions and 4 deletions

...	...	@@ -78,6 +78,9 @@
78	78	private Date applyTimeStart;
79	79	private Date applyTimeEnd;
80	80
	81	+ private Date createdStart;
	82	+ private Date createdEnd;
	83	+
81	84	//产筛医院
82	85	private String sieveHospitalId;
83	86
...	...	@@ -85,6 +88,22 @@
85	88	private String applyHospitalId;
86	89	private List<String> parentIds;
87	90
	91	+ public Date getCreatedStart() {
	92	+ return createdStart;
	93	+ }
	94	+
	95	+ public void setCreatedStart(Date createdStart) {
	96	+ this.createdStart = createdStart;
	97	+ }
	98	+
	99	+ public Date getCreatedEnd() {
	100	+ return createdEnd;
	101	+ }
	102	+
	103	+ public void setCreatedEnd(Date createdEnd) {
	104	+ this.createdEnd = createdEnd;
	105	+ }
	106	+
88	107	public List<String> getParentIds() {
89	108	return parentIds;
90	109	}
...	...	@@ -348,6 +367,22 @@
348	367	c1 = c1.lte(resultTimeEnd);
349	368	} else {
350	369	c1 = Criteria.where("resultTime").lte(resultTimeEnd);
	370	+ }
	371	+ }
	372	+
	373	+ if (null != createdStart) {
	374	+ if (null != c1) {
	375	+ c1 = c1.and("created").gte(createdStart);
	376	+ } else {
	377	+ c1 = Criteria.where("created").gte(createdStart);
	378	+ }
	379	+ }
	380	+
	381	+ if (null != createdEnd) {
	382	+ if (c1 != null) {
	383	+ c1 = c1.lte(createdEnd);
	384	+ } else {
	385	+ c1 = Criteria.where("created").lte(createdEnd);
351	386	}
352	387	}
353	388

...	...	@@ -1242,14 +1242,13 @@
1242	1242
1243	1243	List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
1244	1244
1245		-
1246	1245	//应筛查人数
1247	1246	SieveQuery ySieveQuery = new SieveQuery();
1248	1247	ySieveQuery.setHospitalIds(hids);
1249	1248	if (dates != null) {
1250		- ySieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
	1249	+ ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0]));
1251	1250	if (dates.length == 2) {
1252		- ySieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
	1251	+ ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
1253	1252	}
1254	1253	}
1255	1254	int ycount = sieveService.queryListCount(ySieveQuery);
...	...	@@ -1271,7 +1270,7 @@
1271	1270
1272	1271	//诊断总人数
1273	1272	DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
1274		- diagnosisQuery1.setHospitalIds(currentUserHospPermissions);
	1273	+ diagnosisQuery1.setHospitalIds(hids);
1275	1274	if (dates != null) {
1276	1275	diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
1277	1276	if (dates.length == 2) {