jiangjiazhi / regional-platform

Commit 622f905ccb11faee97bbd3344a0db128e46934e0

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 95 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.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/BabyStatisticsManagerFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStatisticsManagerWeekAgeListRequest.java

...	...	@@ -26,6 +26,8 @@
26	26
27	27	private String id;
28	28
	29	+ private List<String> ids;
	30	+
29	31	private Boolean hasBlno;
30	32	/**
31	33	* 关键字
...	...	@@ -490,6 +492,14 @@
490	492	this.weakSonInfo = weakSonInfo;
491	493	}
492	494
	495	+ public List<String> getIds() {
	496	+ return ids;
	497	+ }
	498	+
	499	+ public void setIds(List<String> ids) {
	500	+ this.ids = ids;
	501	+ }
	502	+
493	503	public String getDeformityKey() {
494	504	return deformityKey;
495	505	}
...	...	@@ -949,6 +959,9 @@
949	959	}
950	960	if (null != id) {
951	961	condition = condition.and("id", id, MongoOper.IS);
	962	+ }
	963	+ if (null != ids) {
	964	+ condition = condition.and("id", ids, MongoOper.IN);
952	965	}
953	966	if (null != parentIds && parentIds.size() > 0) {
954	967	condition = condition.and("parentid", parentIds, MongoOper.IN);

...	...	@@ -2452,6 +2452,9 @@
2452	2452	List<Integer> weightTitles = new LinkedList<>();
2453	2453	List<String> weightValues = new LinkedList<>();
2454	2454
	2455	+ List<Integer> headTitles = new LinkedList<>();
	2456	+ List<String> headValues = new LinkedList<>();
	2457	+
2455	2458	List<Integer> heightTitles = new LinkedList<>();
2456	2459	List<String> heightValues = new LinkedList<>();
2457	2460
...	...	@@ -2480,7 +2483,10 @@
2480	2483	if (CollectionUtils.isNotEmpty(checkModels)) {
2481	2484	for (BabyCheckModel checkModel : checkModels) {
2482	2485	if (checkModel != null) {
2483		- if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()) \|\| org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) {
	2486	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())
	2487	+ \|\| org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())
	2488	+ \|\| org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHead())
	2489	+ ) {
2484	2490	int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(), checkModel.getCheckDate());
2485	2491	Map<String, Object> heightMap = new HashMap<>();
2486	2492	heightMap.put("time", month);
...	...	@@ -2514,6 +2520,21 @@
2514	2520	} else {
2515	2521	heightMap.put("weight", "--");
2516	2522	}
	2523	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHead())) {
	2524	+ if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHead()) \|\| Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHead()).matches()) {
	2525	+
	2526	+ if (headTitles.contains(month)) {//如果存在月的数据则更新对应索引的值
	2527	+ int index = headTitles.indexOf(month);
	2528	+ headValues.set(index, checkModel.getHead());
	2529	+ } else {
	2530	+ headTitles.add(month);
	2531	+ headValues.add(checkModel.getHead());
	2532	+ }
	2533	+ }
	2534	+ heightMap.put("head", checkModel.getHead());
	2535	+ } else {
	2536	+ heightMap.put("head", "--");
	2537	+ }
2517	2538	tables.add(heightMap);
2518	2539	}
2519	2540	}
...	...	@@ -2521,6 +2542,9 @@
2521	2542	}
2522	2543	map.put("weightTitles", weightTitles);
2523	2544	map.put("weightValues", weightValues);
	2545	+
	2546	+ map.put("headTitles", headTitles);
	2547	+ map.put("headValues", headValues);
2524	2548
2525	2549	map.put("heightTitles", heightTitles);
2526	2550	map.put("heightValues", heightValues);

...	...	@@ -505,7 +505,10 @@
505	505	if (!babyStatisticsManagerWeekAgeListRequest.isExcel()) {
506	506	babyCheckModelQuery.setLimit(babyStatisticsManagerWeekAgeListRequest.getLimit());
507	507	babyCheckModelQuery.setPage(babyStatisticsManagerWeekAgeListRequest.getPage());
508		- babyCheckModelQuery.setNeed("need");
	508	+ if(StringUtils.isEmpty(babyStatisticsManagerWeekAgeListRequest.getSex())){
	509	+ babyCheckModelQuery.setNeed("need");
	510	+ }
	511	+
509	512	}
510	513
511	514	String hospitalId;
...	...	@@ -517,6 +520,49 @@
517	520	return babyStatisticsManagerWeekAgeListResult;
518	521	}
519	522	babyCheckModelQuery.setHospitalId(hospitalId);
	523	+ List<BabyStatisticsManagerWeekAgeListQueryModel> babyStatisticsManagerWeekAgeListQueryModelList = getbabyCheckList(babyCheckModelQuery);
	524	+ //性别查询
	525	+ if(StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeListRequest.getSex()) && CollectionUtils.isNotEmpty(babyStatisticsManagerWeekAgeListQueryModelList)){
	526	+ //获取儿童档案id，在筛选性别，后获取儿童id。
	527	+ List<String> list = new ArrayList();
	528	+ for (int i = 0; i < babyStatisticsManagerWeekAgeListQueryModelList.size(); i++) {
	529	+ BabyStatisticsManagerWeekAgeListQueryModel babyStatisticsManagerWeekAgeListQueryModel = babyStatisticsManagerWeekAgeListQueryModelList.get(i);
	530	+ if(babyStatisticsManagerWeekAgeListQueryModel!=null && StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeListQueryModel.getBabyId())){
	531	+ list.add(babyStatisticsManagerWeekAgeListQueryModel.getBabyId());
	532	+ }
	533	+ }
	534	+ BabyModelQuery babyQuery = new BabyModelQuery();
	535	+ babyQuery.setIds(list);
	536	+ babyQuery.setSex(Integer.parseInt(babyStatisticsManagerWeekAgeListRequest.getSex()));
	537	+ babyQuery.setYn(YnEnums.YES.getId());
	538	+ List<BabyModel> babies = babyService.queryBabyWithQuery(babyQuery);
	539	+ List<String> babieslist = new ArrayList();
	540	+ for (int i = 0; i < babies.size(); i++) {
	541	+ BabyModel babyModel = babies.get(i);
	542	+ if(babyModel!=null && StringUtils.isNotEmpty(babyModel.getId())){
	543	+ babieslist.add(babyModel.getId());
	544	+ }
	545	+ }
	546	+ //在筛选儿保检查
	547	+ babyCheckModelQuery.setNeed("need");
	548	+ if(CollectionUtils.isNotEmpty(babieslist)){
	549	+ String[] strings = new String[babieslist.size()];
	550	+ babyCheckModelQuery.setBuildIds(babieslist.toArray(strings));
	551	+ babyStatisticsManagerWeekAgeListQueryModelList = getbabyCheckList(babyCheckModelQuery);
	552	+ }else {
	553	+ babyStatisticsManagerWeekAgeListQueryModelList = null;
	554	+ babyCheckModelQuery.mysqlBuild(0);
	555	+ }
	556	+
	557	+ }
	558	+ babyStatisticsManagerWeekAgeListResult.setPageInfo(babyCheckModelQuery.getPageInfo());
	559	+ babyStatisticsManagerWeekAgeListResult.setData(babyStatisticsManagerWeekAgeListQueryModelList);
	560	+ babyStatisticsManagerWeekAgeListResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	561	+ babyStatisticsManagerWeekAgeListResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	562	+ return babyStatisticsManagerWeekAgeListResult;
	563	+ }
	564	+
	565	+ private List<BabyStatisticsManagerWeekAgeListQueryModel> getbabyCheckList(BabyCheckModelQuery babyCheckModelQuery) {
520	566	List<BabyCheckModel> babyCheckModelList = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery);
521	567
522	568	List<BabyStatisticsManagerWeekAgeListQueryModel> babyStatisticsManagerWeekAgeListQueryModelList = new ArrayList<>();
...	...	@@ -578,12 +624,7 @@
578	624	babyStatisticsManagerWeekAgeListQueryModelList.add(babyStatisticsManagerWeekAgeListQueryModel);
579	625	}
580	626	}
581		-
582		- babyStatisticsManagerWeekAgeListResult.setPageInfo(babyCheckModelQuery.getPageInfo());
583		- babyStatisticsManagerWeekAgeListResult.setData(babyStatisticsManagerWeekAgeListQueryModelList);
584		- babyStatisticsManagerWeekAgeListResult.setErrorcode(ErrorCodeConstants.SUCCESS);
585		- babyStatisticsManagerWeekAgeListResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
586		- return babyStatisticsManagerWeekAgeListResult;
	627	+ return babyStatisticsManagerWeekAgeListQueryModelList;
587	628	}
588	629
589	630	public BabyStatisticsManagerBuildSourceListResult babyStatisticsManagerBuildSourceList(BabyStatisticsManagerBuildSourceListRequest babyStatisticsManagerBuildSourceListRequest) {

...	...	@@ -14,6 +14,15 @@
14	14	private String weekAge;
15	15
16	16	private boolean isExcel;
	17	+ private String sex;
	18	+
	19	+ public String getSex() {
	20	+ return sex;
	21	+ }
	22	+
	23	+ public void setSex(String sex) {
	24	+ this.sex = sex;
	25	+ }
17	26
18	27	public String getCheckDate() {
19	28	return checkDate;