jiangjiazhi / regional-platform

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 2 deletions

...	...	@@ -1043,6 +1043,11 @@
1043	1043	Criteria c = Criteria.where("cityId").is(organization.getCityId());
1044	1044	query.addCriteria(c);
1045	1045	}
	1046	+ else if (request.getPosition() == 4)
	1047	+ {
	1048	+ Criteria c = Criteria.where("provinceId").is(organization.getProvinceId());
	1049	+ query.addCriteria(c);
	1050	+ }
1046	1051
1047	1052	if (StringUtils.isNotEmpty(request.getOptDate())) {
1048	1053	String[] arrs = request.getOptDate().split(" - ");
...	...	@@ -1076,7 +1081,13 @@
1076	1081
1077	1082	if (StringUtils.isNotEmpty(request.getOptHospital()))
1078	1083	{
1079		- Criteria c = Criteria.where("optHospital").is(request.getOptUser());
	1084	+ Criteria c = Criteria.where("optHospital").is(request.getOptHospital());
	1085	+ query.addCriteria(c);
	1086	+ }
	1087	+
	1088	+ if (request.getStatus() != null)
	1089	+ {
	1090	+ Criteria c = Criteria.where("position").is(request.getStatus());
1080	1091	query.addCriteria(c);
1081	1092	}
1082	1093

...	...	@@ -13,7 +13,7 @@
13	13	private Integer type;//1 宫颈癌 2 乳腺癌
14	14
15	15
16		- private Integer status; // 0 录入 1 审核中 2 审核通过 3 驳回
	16	+ private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
17	17
18	18	private String examineDate;//审核时间/驳回时间
19	19	private Integer position;//1 机构 2 县 3 市