jiangjiazhi / regional-platform

Commit 324eada728de828a5ae62365923c667f3db0e7ec

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

年报bug第一波修改

Showing 1 changed file with 18 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java

...	...	@@ -73,6 +73,8 @@
73	73	@Autowired
74	74	private MongoTemplate mongoTemplate;
75	75
	76	+ private Map<String, String> mapCout = new HashMap<>();
	77	+
76	78	public void queryAnnualReport(Integer userId, String time, String provinceId, String cityId, HttpServletResponse httpServletResponse) {
77	79
78	80	//本市户籍
...	...	@@ -218,8 +220,8 @@
218	220	int bigBoyCount = 0;//巨大儿人数
219	221	int zcBabyCount = 0;//早产儿数
220	222	int babySiChanSiTaiCount = 0;//死胎人数
221		- int patientCount = 0;//
222		- int babyCount = 0;//产儿总数
	223	+ /* int patientCount = 0;//
	224	+ int babyCount = 0;//产儿总数*/
223	225	if (CollectionUtils.isNotEmpty(list)) {
224	226	for (Map<String, String> map : list) {
225	227	huoChanCount += Integer.parseInt(map.get("huoChanCount")); //分娩方式剖宫产
...	...	@@ -256,8 +258,8 @@
256	258	bigBoyCount += Integer.parseInt(map.get("bigBoyCount"));
257	259	zcBabyCount += Integer.parseInt(map.get("zcBabyCount"));
258	260	babySiChanSiTaiCount += Integer.parseInt(map.get("babySiChanSiTaiCount"));
259		- patientCount += Integer.parseInt(map.get("patientCount"));
260		- babyCount += Integer.parseInt(map.get("babyCount"));
	261	+ /*patientCount += Integer.parseInt(map.get("patientCount"));
	262	+ babyCount += Integer.parseInt(map.get("babyCount"));*/
261	263	}
262	264	}
263	265	Map<String, String> totalMap = new LinkedHashMap<>();
264	266
265	267
...	...	@@ -265,12 +267,12 @@
265	267	totalMap.put("huoChanCount", String.valueOf(huoChanCount));
266	268	totalMap.put("boyCount", String.valueOf(boyCount));
267	269	totalMap.put("girlCount", String.valueOf(girlCount));
268		- totalMap.put("chanCount", String.valueOf(chanCount));
269	270	totalMap.put("sexNo", "0");
	271	+ totalMap.put("chanCount", String.valueOf(chanCount));
270	272	totalMap.put("maternalCount", String.valueOf(maternalCount));
271	273	totalMap.put("maternalPercent", this.division(maternalCount, chanCount));
272	274	totalMap.put("antexCount", String.valueOf(antexCount));
273		- totalMap.put("antexPercent", this.division(antexCount, patientCount));
	275	+ totalMap.put("antexPercent", this.division(antexCount, Integer.parseInt(mapCout.get("patientCount"))));
274	276	totalMap.put("fiveCount", String.valueOf(fiveCount));
275	277	totalMap.put("fivePercent", this.division(fiveCount, antexCount));
276	278	totalMap.put("antexcCout", String.valueOf(antexcCout));
277	279
...	...	@@ -303,9 +305,9 @@
303	305	totalMap.put("gravidaCount", String.valueOf(gravidaCount));
304	306	totalMap.put("gravidaPervent", this.division(gravidaCount, chanCount));
305	307	totalMap.put("fmZuYuanCount", String.valueOf(fmZuYuanCount));
306		- totalMap.put("fmZuYuanPervent", this.division(fmZuYuanCount, babyCount));
	308	+ totalMap.put("fmZuYuanPervent", this.division(fmZuYuanCount, Integer.parseInt(mapCout.get("babyCount"))));
307	309	totalMap.put("fmPoGongCount", String.valueOf(fmPoGongCount));
308		- totalMap.put("fmPogongPervent", this.division(fmPoGongCount, babyCount));
	310	+ totalMap.put("fmPogongPervent", this.division(fmPoGongCount, Integer.parseInt(mapCout.get("babyCount"))));
309	311	totalMap.put("killCount", String.valueOf(killCount));
310	312	Double killPervent = (double) killCount != 0.0 ? (double) killCount / 100000 : 0;
311	313	totalMap.put("killPervent", String.valueOf(killPervent));
...	...	@@ -341,6 +343,8 @@
341	343	List<String> hivList = new ArrayList<>();
342	344	hivList.add("yang");
343	345	hivList.add("yin");
	346	+ Integer patientCountSum = 0;
	347	+ Integer babyCountSum = 0;
344	348	for (Map.Entry<Object, List<String>> entry : hospitalIdMap.entrySet()) {
345	349	Map<String, String> map = new LinkedHashMap<>();
346	350	//机构名称
...	...	@@ -494,7 +498,8 @@
494	498	List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery3);
495	499	int j = 0;
496	500	for (AntExChuModel antExChu : antExChuModels) {
497		- if (null != antExChu.getXhdb()) {
	501	+ if (StringUtils.isNotEmpty(antExChu.getXhdb())) {
	502	+ System.out.println(antExChu.getXhdb());
498	503	if (Integer.valueOf(antExChu.getXhdb()).intValue() > 100) {
499	504	++j;
500	505	}
501	506
...	...	@@ -883,12 +888,12 @@
883	888	babySiWangList.clear();
884	889	map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount));
885	890
886		- map.put("patientCount", String.valueOf(patientCount));
887		- map.put("babyCount", String.valueOf(babyCount));
888		-
	891	+ patientCountSum += patientCount;
	892	+ babyCountSum += babyCount;
889	893	list.add(map);
890	894	}
891		-
	895	+ mapCout.put("patientCount", String.valueOf(patientCountSum));
	896	+ mapCout.put("babyCount", String.valueOf(babyCountSum));
892	897	return list;
893	898	}
894	899