jiangjiazhi / regional-platform

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 40 additions and 0 deletions

...	...	@@ -91,6 +91,11 @@
91	91	Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
92	92	//查询条件
93	93	CancerScreeningQuery query = new CancerScreeningQuery();
	94	+
	95	+ if (StringUtils.isNotEmpty(queryRequest.getHospitalId()))
	96	+ {
	97	+ query.setHospitalId(queryRequest.getHospitalId());
	98	+ }
94	99	query.setLimit(queryRequest.getLimit());
95	100	query.setPage(queryRequest.getPage());
96	101	query.setNeed("need");
97	102
...	...	@@ -1089,8 +1094,11 @@
1089	1094	String hospitalId = autoMatchFacade.getHospitalId(userId);
1090	1095	Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
1091	1096	Query query = new Query();
	1097	+
	1098	+ boolean isCurrent = false;
1092	1099	if (request.getPosition() == 1)
1093	1100	{
	1101	+ isCurrent = true;
1094	1102	Criteria c = Criteria.where("hospitalId").is(hospitalId);
1095	1103	query.addCriteria(c);
1096	1104	}
...	...	@@ -1141,6 +1149,12 @@
1141	1149	Criteria c1 = Criteria.where("areaId").is(request.getAreaId());
1142	1150	query.addCriteria(c1);
1143	1151	}
	1152	+ }
	1153	+
	1154	+ if (StringUtils.isNotEmpty(request.getHospitalId()) && !isCurrent)
	1155	+ {
	1156	+ Criteria c = Criteria.where("hospitalId").is(request.getHospitalId());
	1157	+ query.addCriteria(c);
1144	1158	}
1145	1159
1146	1160	if (StringUtils.isNotEmpty(request.getOptDate())) {

...	...	@@ -95,6 +95,16 @@
95	95	private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
96	96	private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
97	97
	98	+ private String hospitalId;
	99	+
	100	+ public String getHospitalId() {
	101	+ return hospitalId;
	102	+ }
	103	+
	104	+ public void setHospitalId(String hospitalId) {
	105	+ this.hospitalId = hospitalId;
	106	+ }
	107	+
98	108	public Integer getStatus() {
99	109	return status;
100	110	}

...	...	@@ -62,7 +62,15 @@
62	62	private String examineDate;//审核时间/驳回时间
63	63	private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
64	64	private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改
	65	+ private String hospitalId;
65	66
	67	+ public String getHospitalId() {
	68	+ return hospitalId;
	69	+ }
	70	+
	71	+ public void setHospitalId(String hospitalId) {
	72	+ this.hospitalId = hospitalId;
	73	+ }
66	74	public Integer getStatus() {
67	75	return status;
68	76	}

...	...	@@ -163,6 +163,7 @@
163	163	String hospitalId = autoMatchFacade.getHospitalId(userId);
164	164	Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
165	165	Query query = new Query();
	166	+ boolean isCurrent = false;
166	167	if (param.getStatus() != null)
167	168	{
168	169	Criteria c = Criteria.where("position").is(param.getStatus());
...	...	@@ -170,6 +171,7 @@
170	171	}
171	172	if (param.getPosition() == 1)
172	173	{
	174	+ isCurrent = true;
173	175	Criteria c = Criteria.where("hospitalId").is(hospitalId);
174	176	query.addCriteria(c);
175	177	}
...	...	@@ -220,6 +222,12 @@
220	222	Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
221	223	query.addCriteria(c1);
222	224	}
	225	+ }
	226	+
	227	+ if (StringUtils.isNotEmpty(param.getHospitalId()) && !isCurrent)
	228	+ {
	229	+ Criteria c = Criteria.where("hospitalId").is(param.getHospitalId());
	230	+ query.addCriteria(c);
223	231	}
224	232
225	233	String keyword = param.getKeyword();