jiangjiazhi / regional-platform

Commit 841358e413d076f57a3ddf040f40b72a3c42375b

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

隆化统计功能乡镇合并

Showing 5 changed files with 136 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java

...	...	@@ -401,6 +401,7 @@
401	401	*乡镇街道
402	402	*/
403	403	private String babyStreetId;
	404	+ private List<String> babyStreetIds;
404	405	/**
405	406	*详细地址
406	407	*/
...	...	@@ -412,6 +413,14 @@
412	413	// 1 本县 2 外县
413	414	private Integer areaType;
414	415
	416	+ public List<String> getBabyStreetIds() {
	417	+ return babyStreetIds;
	418	+ }
	419	+
	420	+ public void setBabyStreetIds(List<String> babyStreetIds) {
	421	+ this.babyStreetIds = babyStreetIds;
	422	+ }
	423	+
415	424	public Integer getAreaType() {
416	425	return areaType;
417	426	}
...	...	@@ -2204,6 +2213,10 @@
2204	2213	if (StringUtils.isNotEmpty(babyStreetId)) {
2205	2214	condition = condition.and("babyStreetId", babyStreetId, MongoOper.IS);
2206	2215	}
	2216	+ if (CollectionUtils.isNotEmpty(babyStreetIds)) {
	2217	+ condition = condition.and("babyStreetId", babyStreetIds, MongoOper.IN);
	2218	+ }
	2219	+
2207	2220	if (StringUtils.isNotEmpty(babyAddress)) {
2208	2221	condition = condition.and("babyAddress", babyAddress, MongoOper.IN);
2209	2222	}

...	...	@@ -6386,13 +6386,47 @@
6386	6386	//儿童档案
6387	6387	BabyModelQuery babyModelQuery=new BabyModelQuery();
6388	6388	babyModelQuery.setId(checkModel.getBuildId());
6389		- if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) &&
6390		- StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){
	6389	+ if(StringUtils.isNotEmpty(babyProvinceId)){
6391	6390	babyModelQuery.setBabyProvinceId(babyProvinceId);
	6391	+ }
	6392	+ if(StringUtils.isNotEmpty(babyCityId)){
6392	6393	babyModelQuery.setBabyCityId(babyCityId);
	6394	+ }
	6395	+ if(StringUtils.isNotEmpty(babyAreaId)){
6393	6396	babyModelQuery.setBabyAreaId(babyAreaId);
6394		- babyModelQuery.setBabyStreetId(babyStreetId);
6395	6397	}
	6398	+ if(StringUtils.isNotEmpty(babyStreetId)){
	6399	+
	6400	+ if("2112".equals(babyStreetId))
	6401	+ {
	6402	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef"));
	6403	+ }
	6404	+ else if ("2114".equals(babyStreetId))
	6405	+ {
	6406	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d"));
	6407	+ }
	6408	+ else if ("2116".equals(babyStreetId))
	6409	+ {
	6410	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4"));
	6411	+ }
	6412	+ else if ("2117".equals(babyStreetId))
	6413	+ {
	6414	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286"));
	6415	+ }
	6416	+ else if ("2119".equals(babyStreetId))
	6417	+ {
	6418	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a"));
	6419	+ }
	6420	+ else if ("2120".equals(babyStreetId))
	6421	+ {
	6422	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c"));
	6423	+ }
	6424	+ else {
	6425	+ babyModelQuery.setBabyStreetId(babyStreetId);
	6426	+ }
	6427	+
	6428	+
	6429	+ }
6396	6430	List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
6397	6431	for (BabyModel babyModel : babyModels) {
6398	6432	Map resultMap=new HashMap();
...	...	@@ -6454,7 +6488,33 @@
6454	6488	babyModelQuery.setBabyAreaId(babyAreaId);
6455	6489	}
6456	6490	if(StringUtils.isNotEmpty(babyStreetId)){
6457		- babyModelQuery.setBabyStreetId(babyStreetId);
	6491	+ if("2112".equals(babyStreetId))
	6492	+ {
	6493	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef"));
	6494	+ }
	6495	+ else if ("2114".equals(babyStreetId))
	6496	+ {
	6497	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d"));
	6498	+ }
	6499	+ else if ("2116".equals(babyStreetId))
	6500	+ {
	6501	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4"));
	6502	+ }
	6503	+ else if ("2117".equals(babyStreetId))
	6504	+ {
	6505	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286"));
	6506	+ }
	6507	+ else if ("2119".equals(babyStreetId))
	6508	+ {
	6509	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a"));
	6510	+ }
	6511	+ else if ("2120".equals(babyStreetId))
	6512	+ {
	6513	+ babyModelQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c"));
	6514	+ }
	6515	+ else {
	6516	+ babyModelQuery.setBabyStreetId(babyStreetId);
	6517	+ }
6458	6518	}
6459	6519	List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
6460	6520	for (BabyModel babyModel : babyModels) {

...	...	@@ -1463,7 +1463,7 @@
1463	1463	// List<String> hospital = groupsFacade.findGroupHospital(userId, false);
1464	1464	String hospitalId = autoMatchFacade.getHospitalId(userId);
1465	1465	Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
1466		- Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
	1466	+ Criteria pCriteria = Criteria.where("yn").ne(0);//.and("hospitalId").is(hospitalId);
1467	1467	if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
1468	1468	pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
1469	1469	Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo));

...	...	@@ -181,7 +181,33 @@
181	181	criteria.and("babyAreaId").is(areaId);
182	182	}
183	183	if(StringUtils.isNotEmpty(streetId)){
184		- criteria.and("babyStreetId").is(streetId);
	184	+ if("2112".equals(streetId))
	185	+ {
	186	+ criteria.and("babyStreetId").in(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef"));
	187	+ }
	188	+ else if ("2114".equals(streetId))
	189	+ {
	190	+ criteria.and("babyStreetId").in(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d"));
	191	+ }
	192	+ else if ("2116".equals(streetId))
	193	+ {
	194	+ criteria.and("babyStreetId").in(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4"));
	195	+ }
	196	+ else if ("2117".equals(streetId))
	197	+ {
	198	+ criteria.and("babyStreetId").in(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286"));
	199	+ }
	200	+ else if ("2119".equals(streetId))
	201	+ {
	202	+ criteria.and("babyStreetId").in(Arrays.asList("2119","5f041f0d25dc36c779f7d52a"));
	203	+ }
	204	+ else if ("2120".equals(streetId))
	205	+ {
	206	+ criteria.and("babyStreetId").in(Arrays.asList("2120","5f041f3e25dc36c779f7d55c"));
	207	+ }
	208	+ else {
	209	+ criteria.and("babyStreetId").is(streetId);
	210	+ }
185	211	}
186	212	if(null!=queryStartBirth&&null!=queryEndtBirth){
187	213	criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth);

...	...	@@ -1334,6 +1334,37 @@
1334	1334	babyQuery.setBabyCityId(request.getBabyCityId());
1335	1335	babyQuery.setBabyAreaId(request.getBabyAreaId());
1336	1336	babyQuery.setBabyStreetId(request.getBabyStreetId());
	1337	+
	1338	+ if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(request.getBabyStreetId())){
	1339	+ if("2112".equals(request.getBabyStreetId()))
	1340	+ {
	1341	+ babyQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef"));
	1342	+ }
	1343	+ else if ("2114".equals(request.getBabyStreetId()))
	1344	+ {
	1345	+ babyQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d"));
	1346	+ }
	1347	+ else if ("2116".equals(request.getBabyStreetId()))
	1348	+ {
	1349	+ babyQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4"));
	1350	+ }
	1351	+ else if ("2117".equals(request.getBabyStreetId()))
	1352	+ {
	1353	+ babyQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286"));
	1354	+ }
	1355	+ else if ("2119".equals(request.getBabyStreetId()))
	1356	+ {
	1357	+ babyQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a"));
	1358	+ }
	1359	+ else if ("2120".equals(request.getBabyStreetId()))
	1360	+ {
	1361	+ babyQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c"));
	1362	+ }
	1363	+ else {
	1364	+ babyQuery.setBabyStreetId(request.getBabyStreetId());
	1365	+ }
	1366	+ }
	1367	+
1337	1368	babyQuery.setBabyAddress(request.getBabyAddress());
1338	1369
1339	1370	//筛选检查时间