jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 18 additions and 3 deletions

...	...	@@ -3385,10 +3385,25 @@
3385	3385	}
3386	3386	}
3387	3387	hospitalDate.put("data10",data9_data8+"%");
	3388	+
	3389	+
3388	3390	//0-6岁儿童健康管理人数
3389		- hospitalDate.put("data11",data9+lastDate9);
	3391	+ babyQuery.setCompleteCheck(null);
	3392	+ babyQuery.setLastCheckDoctor2(true);
	3393	+ int data11 = babyBookbuildingService.queryBabyCount(babyQuery);
	3394	+ int lastDate11= null==hospitalDate.get("data11")?0:Integer.parseInt(hospitalDate.get("data11").toString());
	3395	+ hospitalDate.put("data11",data11+lastDate11);
3390	3396	//0-6岁儿童健康管理率%
3391		- hospitalDate.put("data12",data9_data8+"%");
	3397	+ String data11_data12="0.00";
	3398	+ if(Integer.parseInt(hospitalDate.get("data8").toString())!=0){
	3399	+ float v = (float) Integer.parseInt(hospitalDate.get("data11").toString()) / Integer.parseInt(hospitalDate.get("data8").toString());
	3400	+ if(v>=1){
	3401	+ data11_data12="100.00";
	3402	+ }else {
	3403	+ data11_data12 = df.format(v * 100);
	3404	+ }
	3405	+ }
	3406	+ hospitalDate.put("data12",data11_data12+"%");
3392	3407
3393	3408
3394	3409	//0-6岁儿童眼保健及视力检查人数
...	...	@@ -3900,7 +3915,7 @@
3900	3915	patientsQuery.setYn(YnEnums.YES.getId());
3901	3916	patientsQuery.setHospitalList(hospitalIds);
3902	3917	patientsQuery.setBuildDaysStart(0);
3903		- patientsQuery.setBuildDaysEnd(13*7);
	3918	+ patientsQuery.setBuildDaysEnd(13*7-1);
3904	3919	patientsQuery.setExtEnable(false);
3905	3920	patientsQuery.setBuildTypeNot(1);
3906	3921	patientsQuery.setDueStatus(0);