jiangjiazhi / regional-platform

Commit c1da54ea6d5f875a2b5d27dc8f6162df39a989f5

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

出血量,巨大儿,窒息分钟数字段添加

Showing 4 changed files with 214 additions and 184 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java

...	...	@@ -192,6 +192,7 @@
192	192	//用来配合查询新筛实验室列表数据
193	193	private List sieveStatusList2;
194	194
	195	+
195	196	public List getSieveStatusList2() {
196	197	return sieveStatusList2;
197	198	}
...	...	@@ -239,6 +240,25 @@
239	240	private String babyHeightStart;
240	241	private String babyHeightEnd;
241	242
	243	+ private String asphyxiaMStart;
	244	+ private String asphyxiaMEnd;
	245	+
	246	+ public String getAsphyxiaMStart() {
	247	+ return asphyxiaMStart;
	248	+ }
	249	+
	250	+ public void setAsphyxiaMStart(String asphyxiaMStart) {
	251	+ this.asphyxiaMStart = asphyxiaMStart;
	252	+ }
	253	+
	254	+ public String getAsphyxiaMEnd() {
	255	+ return asphyxiaMEnd;
	256	+ }
	257	+
	258	+ public void setAsphyxiaMEnd(String asphyxiaMEnd) {
	259	+ this.asphyxiaMEnd = asphyxiaMEnd;
	260	+ }
	261	+
242	262	public List<String> getParentIds() {
243	263	return parentIds;
244	264	}
245	265
246	266
...	...	@@ -951,13 +971,13 @@
951	971	if (null != expVip) {
952	972	condition = condition.and("expVip", expVip, MongoOper.IS);
953	973	}
954		- if(null != sieveStatus && !"0".equals(sieveStatus)){
	974	+ if (null != sieveStatus && !"0".equals(sieveStatus)) {
955	975	condition = condition.and("sieveStatus", sieveStatus, MongoOper.IS);
956	976	}
957		- if(null != sieveStatusList){
	977	+ if (null != sieveStatusList) {
958	978	condition = condition.and("sieveStatus", sieveStatusList, MongoOper.NIN);
959	979	}
960		- if(null != sieveStatusList2){
	980	+ if (null != sieveStatusList2) {
961	981	condition = condition.and("sieveStatus", sieveStatusList2, MongoOper.IN);
962	982	}
963	983
...	...	@@ -1008,6 +1028,21 @@
1008	1028	}
1009	1029
1010	1030
	1031	+ if (null != asphyxiaMStart) {
	1032	+ if (null != c) {
	1033	+ c = c.and("asphyxiaM").gte(asphyxiaMStart);
	1034	+ } else {
	1035	+ c = Criteria.where("asphyxiaM").gte(asphyxiaMStart);
	1036	+ }
	1037	+ }
	1038	+ if (null != asphyxiaMEnd) {
	1039	+ if (null != c) {
	1040	+ c = c.lte(asphyxiaMEnd);
	1041	+ } else {
	1042	+ c = Criteria.where("asphyxiaM").lte(asphyxiaMEnd);
	1043	+ }
	1044	+ }
	1045	+
1011	1046	if (null != buildDateStart) {
1012	1047	if (null != c) {
1013	1048	c = c.and("buildDate").gte(buildDateStart);
1014	1049
...	...	@@ -1064,10 +1099,10 @@
1064	1099	}
1065	1100	}
1066	1101
1067		- if(null != createdTimeStart && createdTimeEnd != null){
1068		- if(c != null){
	1102	+ if (null != createdTimeStart && createdTimeEnd != null) {
	1103	+ if (c != null) {
1069	1104	c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
1070		- }else{
	1105	+ } else {
1071	1106	c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
1072	1107	}
1073	1108	}

...	...	@@ -563,8 +563,7 @@
563	563	@TokenRequired
564	564	@ResponseBody
565	565	@RequestMapping(value = "newBabyManager", method = RequestMethod.POST)
566		- //@RequestBody
567		- public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, NewBabyManagerRequest newBabyManagerRequest) {
	566	+ public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest) {
568	567	BaseListResponse baseListResponse;
569	568	try {
570	569	newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());

...	...	@@ -473,8 +473,7 @@
473	473	}
474	474
475	475	//育龄服务生孩统计数据处理
476		- if (StringUtils.isNotEmpty(patients2.getPid()))
477		- {
	476	+ if (StringUtils.isNotEmpty(patients2.getPid())) {
478	477	handleMatDeliver(patients2.getPid());
479	478	}
480	479
...	...	@@ -482,9 +481,7 @@
482	481	}
483	482
484	483
485		-
486		- public void handleMatDeliver(final String pid)
487		- {
	484	+ public void handleMatDeliver(final String pid) {
488	485	new Thread(new Runnable() {
489	486	@Override
490	487	public void run() {
491	488
492	489
...	...	@@ -495,18 +492,15 @@
495	492	personModelQuery.setTypes(new Integer[]{1, 3}); //孕妇或者产妇基本信息
496	493	personModelQuery.setNeed("true");
497	494	personModelQuery.setLimit(limt);
498		- if (StringUtils.isNotEmpty(pid))
499		- {
	495	+ if (StringUtils.isNotEmpty(pid)) {
500	496	personModelQuery.setId(pid);
501	497	}
502		- while (true)
503		- {
504		- System.out.println("page======"+page);
	498	+ while (true) {
	499	+ System.out.println("page======" + page);
505	500	personModelQuery.setPage(page);
506	501
507	502	List<PersonModel> personModels = personService.queryPersons(personModelQuery, Sort.Direction.DESC, "created");
508		- if (CollectionUtils.isNotEmpty(personModels))
509		- {
	503	+ if (CollectionUtils.isNotEmpty(personModels)) {
510	504	System.out.println("sss");
511	505	int batchSize = 200;
512	506	int end = 0;
513	507
514	508
515	509
...	...	@@ -525,35 +519,29 @@
525	519	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
526	520	matDeliverQuery.setYn(YnEnums.YES.getId());
527	521	matDeliverQuery.setPid(person.getId());
528		- List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery,Sort.Direction.ASC,"created");
529		- if (CollectionUtils.isNotEmpty(maternalDeliverModels))
530		- {
531		- int upCount = 0;
532		- for(int i = 0 ; i < maternalDeliverModels.size() ; i++)
533		- {
	522	+ List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery, Sort.Direction.ASC, "created");
	523	+ if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
	524	+ int upCount = 0;
	525	+ for (int i = 0; i < maternalDeliverModels.size(); i++) {
534	526	MaternalDeliverModel model = maternalDeliverModels.get(i);
535	527	List<MaternalDeliverModel.Baby> babyList = model.getBaby();
536	528
537	529	List<Integer> fmChildTimes = new ArrayList<Integer>();
538		- if (CollectionUtils.isNotEmpty(babyList))
539		- {
540		- for (int j = 0;j < babyList.size();j++)
541		- {
542		- upCount+=1;
543		- if (upCount > 4)
544		- {
	530	+ if (CollectionUtils.isNotEmpty(babyList)) {
	531	+ for (int j = 0; j < babyList.size(); j++) {
	532	+ upCount += 1;
	533	+ if (upCount > 4) {
545	534	upCount = 4;
546	535	}
547	536	fmChildTimes.add(upCount);
548	537	model.setFmChildTimes(fmChildTimes);
549	538	}
550	539	Patients patients = patientsService.findOnePatientById(model.getParentId());
551		- if (patients != null)
552		- {
553		- model.setFmAge(DateUtil.getAge(patients.getBirth(),model.getDueDate1()));
	540	+ if (patients != null) {
	541	+ model.setFmAge(DateUtil.getAge(patients.getBirth(), model.getDueDate1()));
554	542	}
555	543	}
556		- matDeliverService.updateOne(model,model.getId());
	544	+ matDeliverService.updateOne(model, model.getId());
557	545	}
558	546	}
559	547	}
...	...	@@ -561,9 +549,7 @@
561	549	}
562	550	});
563	551	}
564		- }
565		- else
566		- {
	552	+ } else {
567	553	break;
568	554	}
569	555	page++;
...	...	@@ -573,7 +559,6 @@
573	559	}
574	560
575	561
576		-
577	562	/**
578	563	* 分娩添加或更新追访信息
579	564	*
...	...	@@ -762,11 +747,8 @@
762	747	}
763	748	}
764	749	}
765		- }
766		- else
767		- {
768		- if (CollectionUtils.isNotEmpty(updateBaby) && updateBaby.get(0).getDataStatus() == null)
769		- {
	750	+ } else {
	751	+ if (CollectionUtils.isNotEmpty(updateBaby) && updateBaby.get(0).getDataStatus() == null) {
770	752	babyModel1.setDataStatus(1);
771	753	}
772	754	}
...	...	@@ -1129,9 +1111,7 @@
1129	1111	babyModel.setBlNo(baby.getBlNo());
1130	1112	babyModel.setBabyDiagnosis(baby.getBabyDiagnosis());
1131	1113	personModel.setYn(YnEnums.YES.getId());
1132		- }
1133		- else
1134		- {
	1114	+ } else {
1135	1115	personModel.setYn(YnEnums.NO.getId());
1136	1116	}
1137	1117	babyModel.setPid(personService.addPerson(personModel).getId());
...	...	@@ -1200,7 +1180,7 @@
1200	1180	} else {
1201	1181	return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
1202	1182	}
1203		- }else if("2100001635".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())){
	1183	+ } else if ("2100001635".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
1204	1184	whfyHisModel = whfyHisService.getIdNo(deliverQueryRequest.getZhuYuanNo());
1205	1185	if (whfyHisModel != null && StringUtils.isNotEmpty(whfyHisModel.getIdno())) {
1206	1186	deliverQueryRequest.setCardNo(whfyHisModel.getIdno());
...	...	@@ -1491,7 +1471,7 @@
1491	1471	map.put("getFmDzEnums", getFmDzEnums());
1492	1472	map.put("getRenShenJieJuEnums", getRenShenJieJuEnums());
1493	1473	map.put("organizations", convert());
1494		- map.put("chFz",getchFzEnums());
	1474	+ map.put("chFz", getchFzEnums());
1495	1475	// 新生儿畸形
1496	1476	List<Map<String, Object>> deformity = EnumUtil.toJson(BabyDeformityEnums.class);
1497	1477	map.put("deformity", deformity);
1498	1478
1499	1479
1500	1480
...	...	@@ -1760,27 +1740,26 @@
1760	1740
1761	1741	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1762	1742
1763		- if(matdeliverFollowRequest.getFollowStarDate()!=null){
	1743	+ if (matdeliverFollowRequest.getFollowStarDate() != null) {
1764	1744	MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery();
1765	1745	matDeliverFollowQuery.setVisitStartDate(matdeliverFollowRequest.getFollowStarDate());
1766	1746	matDeliverFollowQuery.setVisitEndDate(matdeliverFollowRequest.getFollowEndDate());
1767	1747	List<MatdeliverFollowModel> matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery);
1768	1748	List<String> mfIds = new ArrayList<>();
1769		- for(MatdeliverFollowModel md:matdeliverFollowModels){
	1749	+ for (MatdeliverFollowModel md : matdeliverFollowModels) {
1770	1750	mfIds.add(md.getDeliverId());
1771	1751	}
1772	1752	matDeliverQuery.setIds(mfIds);
1773	1753	}
1774	1754
1775	1755
1776		-
1777	1756	//查询号不为空，则查询孕妇id
1778	1757	if (StringUtils.isNotEmpty(matdeliverFollowRequest.getQueryNo())//查询号不为空
1779	1758	\|\| StringUtils.isNotEmpty(matdeliverFollowRequest.getProvinceId())//居住地省
1780	1759	\|\| StringUtils.isNotEmpty(matdeliverFollowRequest.getCityId())//居住地市
1781	1760	\|\| StringUtils.isNotEmpty(matdeliverFollowRequest.getAreaId())//居住区
1782	1761	\|\| StringUtils.isNotEmpty(matdeliverFollowRequest.getStreetId())//居住街道
1783		- ) {
	1762	+ ) {
1784	1763	PatientsQuery patientsQuery = new PatientsQuery();
1785	1764	patientsQuery.setQueryNo(matdeliverFollowRequest.getQueryNo());
1786	1765	patientsQuery.setYn(YnEnums.YES.getId());
1787	1766
1788	1767
...	...	@@ -1825,18 +1804,13 @@
1825	1804	matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
1826	1805	matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
1827	1806	}
1828		- if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null )
1829		- {
	1807	+ if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null) {
1830	1808	matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
1831	1809	matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
1832		- }
1833		- else if (matdeliverFollowRequest.getStartDay() != null)
1834		- {
	1810	+ } else if (matdeliverFollowRequest.getStartDay() != null) {
1835	1811	matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
1836	1812	matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
1837		- }
1838		- else if(matdeliverFollowRequest.getEndDay() != null)
1839		- {
	1813	+ } else if (matdeliverFollowRequest.getEndDay() != null) {
1840	1814	matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
1841	1815	matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
1842	1816	}
...	...	@@ -1865,8 +1839,7 @@
1865	1839	matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType());
1866	1840	List<MaternalDeliverModel> maternalDeliverModelList;
1867	1841
1868		- if (StringUtils.isNotEmpty(matdeliverFollowRequest.getRiskId()))
1869		- {
	1842	+ if (StringUtils.isNotEmpty(matdeliverFollowRequest.getRiskId())) {
1870	1843	PatientsQuery patientsQuery = new PatientsQuery();
1871	1844	patientsQuery.setYn(YnEnums.YES.getId());
1872	1845	patientsQuery.setrFactor(matdeliverFollowRequest.getRiskId());
...	...	@@ -2101,8 +2074,7 @@
2101	2074	matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
2102	2075	// matDeliverQuery.setWeight(childbirthManagerRequest.getWeight());
2103	2076
2104		- if (childbirthManagerRequest.getWeight() != null)
2105		- {
	2077	+ if (childbirthManagerRequest.getWeight() != null) {
2106	2078	BabyModelQuery babyModelQuery = new BabyModelQuery();
2107	2079	// babyModelQuery.setDataStatus(false);
2108	2080	babyModelQuery.setHospitalId(hid);
2109	2081
2110	2082
2111	2083
2112	2084
2113	2085
...	...	@@ -2130,28 +2102,28 @@
2130	2102	}
2131	2103
2132	2104	/********增加产后观察，观察状态条件查询********/
2133		- if(StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())){
	2105	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {
2134	2106	PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery();
2135	2107	prQuery.setGcStatus("1");
2136	2108	prQuery.setIsDelete("1");
2137	2109	List<PostpartumRecords> prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);
2138		- if("0".equals(childbirthManagerRequest.getGcStatus())){//正在观察的产妇，填写完分娩记录默认为正在观察
2139		- if(CollectionUtils.isNotEmpty(prList)){
	2110	+ if ("0".equals(childbirthManagerRequest.getGcStatus())) {//正在观察的产妇，填写完分娩记录默认为正在观察
	2111	+ if (CollectionUtils.isNotEmpty(prList)) {
2140	2112	List<String> sList = new ArrayList<String>();
2141		- for(PostpartumRecords p : prList){
	2113	+ for (PostpartumRecords p : prList) {
2142	2114	sList.add(p.getMaternalDeliverId());
2143	2115	}
2144	2116	matDeliverQuery.setCunZai(sList);
2145	2117	}
2146		- }else if("1".equals(childbirthManagerRequest.getGcStatus())){
	2118	+ } else if ("1".equals(childbirthManagerRequest.getGcStatus())) {
2147	2119	List<String> sList = new ArrayList<String>();
2148		- if(CollectionUtils.isNotEmpty(prList)){
2149		- for(PostpartumRecords p : prList){
	2120	+ if (CollectionUtils.isNotEmpty(prList)) {
	2121	+ for (PostpartumRecords p : prList) {
2150	2122	sList.add(p.getMaternalDeliverId());
2151	2123	}
2152	2124	matDeliverQuery.setIds(sList);
2153		- }else{
2154		- childbirthManagerResult.setPageInfo(new PageInfo(childbirthManagerRequest.getPage(),1,0,childbirthManagerRequest.getLimit()));
	2125	+ } else {
	2126	+ childbirthManagerResult.setPageInfo(new PageInfo(childbirthManagerRequest.getPage(), 1, 0, childbirthManagerRequest.getLimit()));
2155	2127	childbirthManagerResult.setData(null);
2156	2128	childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
2157	2129	childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
2158	2130
...	...	@@ -2193,10 +2165,9 @@
2193	2165	List<MaternalDeliverModel> mlist = maternalDeliverModelList.subList(i, end);
2194	2166	Callable c = new MaterDeliverWorker(organizationService, usersService,
2195	2167	babyService, basicConfigService, childbirthManagerRequest.getInitQuery(),
2196		- mlist, patientsMap,postpartumRecordsService,recordsService);
	2168	+ mlist, patientsMap, postpartumRecordsService, recordsService);
2197	2169	Future f = commonThreadPool.submit(c);
2198		- if (f != null)
2199		- {
	2170	+ if (f != null) {
2200	2171	futures.add(f);
2201	2172	}
2202	2173
...	...	@@ -2219,7 +2190,7 @@
2219	2190	return childbirthManagerResult;
2220	2191	}
2221	2192
2222		- public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest,Integer userId) {
	2193	+ public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest, Integer userId) {
2223	2194	NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
2224	2195	BabyModelQuery babyModelQuery = new BabyModelQuery();
2225	2196	//babyModelQuery.setYn(YnEnums.YES.getId());
2226	2197
...	...	@@ -2244,7 +2215,18 @@
2244	2215	babyModelQuery.setBuildType(2);
2245	2216	babyModelQuery.setOrder("birth");
2246	2217	babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
	2218	+ if (null != newBabyManagerRequest.getHuge() && 1 == newBabyManagerRequest.getHuge()) {
	2219	+ babyModelQuery.setBabyWeightStart("4");
	2220	+ } else if (null != newBabyManagerRequest.getHuge() && 2 == newBabyManagerRequest.getHuge()) {
	2221	+ babyModelQuery.setBabyWeightEnd("3.99");
	2222	+ }
2247	2223
	2224	+ if (null != newBabyManagerRequest.getAsphyxiaMStart()) {
	2225	+ babyModelQuery.setAsphyxiaMStart(newBabyManagerRequest.getAsphyxiaMStart());
	2226	+ }
	2227	+ if (null != newBabyManagerRequest.getAsphyxiaMEnd()) {
	2228	+ babyModelQuery.setAsphyxiaMEnd(newBabyManagerRequest.getAsphyxiaMEnd());
	2229	+ }
2248	2230	List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
2249	2231	if (CollectionUtils.isEmpty(babyModelList)) {
2250	2232	newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
...	...	@@ -2277,7 +2259,7 @@
2277	2259	Date date = format.parse(time);
2278	2260	newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date));
2279	2261	newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(date));
2280		- newBabyManagerQueryModel.setFmDate(DateUtil.getyyyy_MM_dd(date) +" "+ new SimpleDateFormat("HH:mm").format(date));
	2262	+ newBabyManagerQueryModel.setFmDate(DateUtil.getyyyy_MM_dd(date) + " " + new SimpleDateFormat("HH:mm").format(date));
2281	2263	} catch (ParseException e) {
2282	2264	ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time);
2283	2265	}
...	...	@@ -2371,10 +2353,10 @@
2371	2353	}
2372	2354
2373	2355
2374		- public BaseObjectResponse getChildbearAgeCount(String birth, Integer userId,String hospitalId,
2375		- String proviceId,String cityId,String areaId) {
2376		- List<Map<String,String>> list = getChidbearAgeCountData( birth, userId, hospitalId,
2377		- proviceId, cityId, areaId);
	2356	+ public BaseObjectResponse getChildbearAgeCount(String birth, Integer userId, String hospitalId,
	2357	+ String proviceId, String cityId, String areaId) {
	2358	+ List<Map<String, String>> list = getChidbearAgeCountData(birth, userId, hospitalId,
	2359	+ proviceId, cityId, areaId);
2378	2360
2379	2361	BaseObjectResponse objectResponse = new BaseObjectResponse();
2380	2362	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -2383,9 +2365,8 @@
2383	2365	return objectResponse;
2384	2366	}
2385	2367
2386		- private List<Map<String,String>> getChidbearAgeCountData(String birth, Integer userId,String hospitalId,
2387		- String proviceId,String cityId,String areaId)
2388		- {
	2368	+ private List<Map<String, String>> getChidbearAgeCountData(String birth, Integer userId, String hospitalId,
	2369	+ String proviceId, String cityId, String areaId) {
2389	2370	List<String> hospitalIds = new ArrayList<>();
2390	2371	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospitalId)) {
2391	2372	hospitalIds.add(hospitalId);
2392	2373
...	...	@@ -2394,12 +2375,11 @@
2394	2375	hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, proviceId,
2395	2376	cityId, areaId);
2396	2377	}
2397		- List<Map<String,String>> list = new ArrayList<>();
	2378	+ List<Map<String, String>> list = new ArrayList<>();
2398	2379
2399	2380	//String hospitalId = autoMatchFacade.getHospitalId(userId);
2400	2381	List<Integer> ages = new ArrayList<>();
2401		- for (int i = 15; i < 50; i ++)
2402		- {
	2382	+ for (int i = 15; i < 50; i++) {
2403	2383	ages.add(i);
2404	2384	}
2405	2385
...	...	@@ -2413,7 +2393,7 @@
2413	2393	}
2414	2394	List<Integer> alist = ages.subList(i, end);
2415	2395	Callable c = new ChildbearAgeWorker(birth,
2416		- alist,hospitalIds,matDeliverService);
	2396	+ alist, hospitalIds, matDeliverService);
2417	2397	Future f = commonThreadPool.submit(c);
2418	2398	futures.add(f);
2419	2399	}
...	...	@@ -2421,7 +2401,7 @@
2421	2401	if (CollectionUtils.isNotEmpty(futures)) {
2422	2402	for (Future f : futures) {
2423	2403	try {
2424		- list.addAll((List<Map<String,String>>) f.get());
	2404	+ list.addAll((List<Map<String, String>>) f.get());
2425	2405	} catch (Exception e) {
2426	2406	ExceptionUtils.catchException(e, "getChildbearAgeCount list error.");
2427	2407	}
2428	2408
2429	2409
2430	2410
2431	2411
2432	2412
2433	2413
2434	2414
...	...	@@ -2434,31 +2414,30 @@
2434	2414	Integer columnMoreCount = 0;
2435	2415	Integer columnRowCount = 0;
2436	2416
2437		- for (Map<String,String> map : list)
2438		- {
	2417	+ for (Map<String, String> map : list) {
2439	2418	Integer oneCount = Integer.parseInt(map.get("oneCount"));
2440		- columnOneCount+=oneCount;
	2419	+ columnOneCount += oneCount;
2441	2420
2442	2421	Integer twoCount = Integer.parseInt(map.get("twoCount"));
2443		- columnTwoCount+=twoCount;
	2422	+ columnTwoCount += twoCount;
2444	2423
2445	2424	Integer threeCount = Integer.parseInt(map.get("threeCount"));
2446		- columnThreeCount+=threeCount;
	2425	+ columnThreeCount += threeCount;
2447	2426
2448	2427	Integer moreCount = Integer.parseInt(map.get("moreCount"));
2449		- columnMoreCount+=moreCount;
	2428	+ columnMoreCount += moreCount;
2450	2429
2451	2430	Integer rowCount = Integer.parseInt(map.get("rowCount"));
2452		- columnRowCount+=rowCount;
	2431	+ columnRowCount += rowCount;
2453	2432
2454	2433	}
2455	2434
2456		- Map<String,String> allMap = new HashMap<>();
2457		- allMap.put("name","合计");
2458		- allMap.put("oneCount",String.valueOf(columnOneCount));
	2435	+ Map<String, String> allMap = new HashMap<>();
	2436	+ allMap.put("name", "合计");
	2437	+ allMap.put("oneCount", String.valueOf(columnOneCount));
2459	2438	allMap.put("twoCount", String.valueOf(columnTwoCount));
2460	2439	allMap.put("threeCount", String.valueOf(columnThreeCount));
2461		- allMap.put("moreCount",String.valueOf(columnMoreCount));
	2440	+ allMap.put("moreCount", String.valueOf(columnMoreCount));
2462	2441	allMap.put("rowCount", String.valueOf(columnRowCount));
2463	2442
2464	2443	list.add(allMap);
2465	2444
...	...	@@ -2466,10 +2445,10 @@
2466	2445	}
2467	2446
2468	2447	public void exportChildbearAgeCount(String birth, Integer userId, String hospitalId,
2469		- String proviceId, String cityId, String areaId,
2470		- HttpServletResponse httpServletResponse) {
	2448	+ String proviceId, String cityId, String areaId,
	2449	+ HttpServletResponse httpServletResponse) {
2471	2450	try {
2472		- List<Map<String,Object>> list = (ArrayList)getChidbearAgeCountData(birth, userId, hospitalId,
	2451	+ List<Map<String, Object>> list = (ArrayList) getChidbearAgeCountData(birth, userId, hospitalId,
2473	2452	proviceId, cityId, areaId);
2474	2453	Map<String, String> header = new LinkedHashMap<>();
2475	2454	header.put("name", "年龄");
...	...	@@ -2481,9 +2460,8 @@
2481	2460	httpServletResponse.setContentType("application/force-download");
2482	2461	httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("育龄服务生孩统计.xls").getBytes("UTF-8"), "ISO-8859-1"));
2483	2462	ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
2484		- }catch (Exception e)
2485		- {
2486		- ExceptionUtils.catchException(e,"exportChildbearAgeCount error");
	2463	+ } catch (Exception e) {
	2464	+ ExceptionUtils.catchException(e, "exportChildbearAgeCount error");
2487	2465	}
2488	2466	}
2489	2467
...	...	@@ -2505,8 +2483,8 @@
2505	2483	}
2506	2484	}
2507	2485
2508		- Map<String,String> params = new HashMap<>();
2509		- params.put("provinceId",provinceId);
	2486	+ Map<String, String> params = new HashMap<>();
	2487	+ params.put("provinceId", provinceId);
2510	2488	params.put("cityId", cityId);
2511	2489	params.put("areaId", areaId);
2512	2490
2513	2491
2514	2492
2515	2493
2516	2494
2517	2495
2518	2496
2519	2497
...	...	@@ -2514,42 +2492,37 @@
2514	2492	List<String> hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, provinceId,
2515	2493	cityId, areaId);
2516	2494
2517		- List<Map<String,String>> list = getDatas(hospitalIds, time,params, basicConfigs);
	2495	+ List<Map<String, String>> list = getDatas(hospitalIds, time, params, basicConfigs);
2518	2496
2519	2497	httpServletResponse.setContentType("application/force-download");
2520	2498	httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("助产机构报表.xls").getBytes("UTF-8"), "ISO-8859-1"));
2521		- String path = this.getClass().getResource("/").getPath()+ "due_org_report.xls";
	2499	+ String path = this.getClass().getResource("/").getPath() + "due_org_report.xls";
2522	2500	System.out.println(path);
2523	2501
2524		- String timeStr = DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[0])+"-"+DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[1]);
	2502	+ String timeStr = DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[0]) + "-" + DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[1]);
2525	2503	String title = "";
2526	2504	String areaName = "";
2527		- if (StringUtils.isNotEmpty(areaId))
2528		- {
	2505	+ if (StringUtils.isNotEmpty(areaId)) {
2529	2506	BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
2530	2507	basicConfigQuery1.setYn(YnEnums.YES.getId());
2531	2508	basicConfigQuery1.setId(areaId);
2532	2509	List<BasicConfig> areas = basicConfigService.queryBasicConfig(basicConfigQuery);
2533		- if (CollectionUtils.isNotEmpty(areas))
2534		- {
2535		- title = areas.get(0).getName()+"助产机构相关数据月报表";
2536		- areaName = "市县区:"+areas.get(0).getName();
	2510	+ if (CollectionUtils.isNotEmpty(areas)) {
	2511	+ title = areas.get(0).getName() + "助产机构相关数据月报表";
	2512	+ areaName = "市县区:" + areas.get(0).getName();
2537	2513	}
2538		- }
2539		- else
2540		- {
	2514	+ } else {
2541	2515	BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
2542	2516	basicConfigQuery1.setYn(YnEnums.YES.getId());
2543	2517	basicConfigQuery1.setId(cityId);
2544	2518	List<BasicConfig> cities = basicConfigService.queryBasicConfig(basicConfigQuery);
2545		- if (CollectionUtils.isNotEmpty(cities))
2546		- {
2547		- title = cities.get(0).getName()+"助产机构相关数据月报表";
2548		- areaName = "市县区:"+cities.get(0).getName();
	2519	+ if (CollectionUtils.isNotEmpty(cities)) {
	2520	+ title = cities.get(0).getName() + "助产机构相关数据月报表";
	2521	+ areaName = "市县区:" + cities.get(0).getName();
2549	2522	}
2550	2523	}
2551	2524
2552		- ExcelUtil.writeExclFile(path , httpServletResponse.getOutputStream(), areaNames,title,areaName,timeStr,list);
	2525	+ ExcelUtil.writeExclFile(path, httpServletResponse.getOutputStream(), areaNames, title, areaName, timeStr, list);
2553	2526	} catch (IOException e) {
2554	2527	ExceptionUtils.catchException(e, "exporDueOrgCount error");
2555	2528	}
2556	2529
2557	2530
2558	2531
...	...	@@ -2571,20 +2544,20 @@
2571	2544	}
2572	2545	}
2573	2546
2574		- Map<String,String> params = new HashMap<>();
2575		- params.put("provinceId",provinceId);
	2547	+ Map<String, String> params = new HashMap<>();
	2548	+ params.put("provinceId", provinceId);
2576	2549	params.put("cityId", cityId);
2577	2550	params.put("areaId", areaId);
2578	2551
2579	2552	//获取用户拥有的权限医院和条件筛选的医院交集
2580	2553	List<String> hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, provinceId,
2581		- cityId, areaId);
	2554	+ cityId, areaId);
2582	2555
2583		- List<Map<String,String>> list = getDatas(hospitalIds, time,params, basicConfigs);
	2556	+ List<Map<String, String>> list = getDatas(hospitalIds, time, params, basicConfigs);
2584	2557
2585		- Map<String,Object> data = new HashMap<>();
2586		- data.put("countData",list);
2587		- data.put("areaNames",areaNames);
	2558	+ Map<String, Object> data = new HashMap<>();
	2559	+ data.put("countData", list);
	2560	+ data.put("areaNames", areaNames);
2588	2561
2589	2562	BaseObjectResponse objectResponse = new BaseObjectResponse();
2590	2563	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -2593,9 +2566,8 @@
2593	2566	return objectResponse;
2594	2567	}
2595	2568
2596		- private List<Map<String,String>> getDatas(List<String> hospitalIds,String time,Map<String,String> params, List<BasicConfig> basicConfigs)
2597		- {
2598		- List<Map<String,String>> list = new ArrayList<>();
	2569	+ private List<Map<String, String>> getDatas(List<String> hospitalIds, String time, Map<String, String> params, List<BasicConfig> basicConfigs) {
	2570	+ List<Map<String, String>> list = new ArrayList<>();
2599	2571
2600	2572	int batchSize = 5;
2601	2573	int end = 0;
...	...	@@ -2607,7 +2579,7 @@
2607	2579	}
2608	2580
2609	2581	List<String> hids = hospitalIds.subList(i, end);
2610		- Callable c = new DueOrgCountWorker(time,hids,matDeliverService,organizationService,patientsService,babyService,params,basicConfigs);
	2582	+ Callable c = new DueOrgCountWorker(time, hids, matDeliverService, organizationService, patientsService, babyService, params, basicConfigs);
2611	2583	Future f = commonThreadPool.submit(c);
2612	2584	futures.add(f);
2613	2585	}
...	...	@@ -2615,7 +2587,7 @@
2615	2587	if (CollectionUtils.isNotEmpty(futures)) {
2616	2588	for (Future f : futures) {
2617	2589	try {
2618		- list.addAll((List<Map<String,String>>) f.get());
	2590	+ list.addAll((List<Map<String, String>>) f.get());
2619	2591	} catch (Exception e) {
2620	2592	ExceptionUtils.catchException(e, "getChildbearAgeCount list error.");
2621	2593	}
...	...	@@ -2627,8 +2599,7 @@
2627	2599	return list;
2628	2600	}
2629	2601
2630		- public void sum(List<Map<String,String>> list,List<BasicConfig> basicConfigs)
2631		- {
	2602	+ public void sum(List<Map<String, String>> list, List<BasicConfig> basicConfigs) {
2632	2603
2633	2604	int fmPoGongCount = 0; //分娩方式剖宫产
2634	2605	int wsCount = 0; //外省
...	...	@@ -2654,7 +2625,7 @@
2654	2625	int fzrDoubleCount = 0; //非自然妊娠双胎
2655	2626
2656	2627
2657		- int bigBoyCount =0 ; //巨大儿数
	2628	+ int bigBoyCount = 0; //巨大儿数
2658	2629	int lowWeightCount = 0; //低出生体重数
2659	2630
2660	2631	// int babySiWangCount = ; //新生儿死亡数
...	...	@@ -2663,10 +2634,8 @@
2663	2634	// int sieveFreeCount = ; //35岁以下免费筛查数
2664	2635	// int fmOtherCount = ; //分娩方式其他
2665	2636
2666		- if (CollectionUtils.isNotEmpty(list))
2667		- {
2668		- for (Map<String,String> map : list)
2669		- {
	2637	+ if (CollectionUtils.isNotEmpty(list)) {
	2638	+ for (Map<String, String> map : list) {
2670	2639	fmPoGongCount += Integer.parseInt(map.get("fmPoGongCount")); //分娩方式剖宫产
2671	2640	wsCount += Integer.parseInt(map.get("wsCount")); //外省
2672	2641	chanCount += Integer.parseInt(map.get("chanCount")); //产妇数
2673	2642
2674	2643
2675	2644
2676	2645
2677	2646
...	...	@@ -2695,48 +2664,46 @@
2695	2664	}
2696	2665
2697	2666
2698		- Map<String,String> totalMap = new LinkedHashMap<>();
	2667	+ Map<String, String> totalMap = new LinkedHashMap<>();
2699	2668
2700		- totalMap.put("orgName","合计");
2701		- totalMap.put("chanCount",String.valueOf(chanCount));
2702		- totalMap.put("riskCount",String.valueOf(riskCount));
2703		- totalMap.put("huoChanCount",String.valueOf(huoChanCount));
2704		- totalMap.put("doubleCount",String.valueOf(doubleCount));
2705		- totalMap.put("fzrDoubleCount",String.valueOf(fzrDoubleCount));
2706		- totalMap.put("boyCount",String.valueOf(boyCount));
2707		- totalMap.put("girlCount",String.valueOf(girlCount));
2708		- totalMap.put("fmShunChanCount",String.valueOf(fmShunChanCount));
2709		- totalMap.put("fmPoGongCount",String.valueOf(fmPoGongCount));
2710		- totalMap.put("fmCount",String.valueOf(fmCount));
2711		- totalMap.put("fmOtherCount","");
2712		- totalMap.put("huiYinFullCount",String.valueOf(huiYinFullCount));
2713		- totalMap.put("huiYinSpitCount",String.valueOf(huiYinSpitCount));
2714		- totalMap.put("siLielevelCount",String.valueOf(siLielevelCount));
2715		- totalMap.put("siLielevelYzCount",String.valueOf(siLielevelYzCount));
2716		- totalMap.put("huiYingTotalCount",String.valueOf(huiYingTotalCount));
2717		- totalMap.put("queXianBabyCount",String.valueOf(queXianBabyCount));
2718		- totalMap.put("babySiWangCount","");
2719		- totalMap.put("babySiChanCount",String.valueOf(babySiChanCount));
2720		- totalMap.put("babySiTaiCount",String.valueOf(babySiTaiCount));
2721		- totalMap.put("bigBoyCount",String.valueOf(bigBoyCount));
2722		- totalMap.put("lowWeightCount",String.valueOf(lowWeightCount));
2723		- totalMap.put("zcBabyCount",String.valueOf(zcBabyCount));
2724		- totalMap.put("bswsCount",String.valueOf(bswsCount));
2725		- totalMap.put("wsCount",String.valueOf(wsCount));
	2669	+ totalMap.put("orgName", "合计");
	2670	+ totalMap.put("chanCount", String.valueOf(chanCount));
	2671	+ totalMap.put("riskCount", String.valueOf(riskCount));
	2672	+ totalMap.put("huoChanCount", String.valueOf(huoChanCount));
	2673	+ totalMap.put("doubleCount", String.valueOf(doubleCount));
	2674	+ totalMap.put("fzrDoubleCount", String.valueOf(fzrDoubleCount));
	2675	+ totalMap.put("boyCount", String.valueOf(boyCount));
	2676	+ totalMap.put("girlCount", String.valueOf(girlCount));
	2677	+ totalMap.put("fmShunChanCount", String.valueOf(fmShunChanCount));
	2678	+ totalMap.put("fmPoGongCount", String.valueOf(fmPoGongCount));
	2679	+ totalMap.put("fmCount", String.valueOf(fmCount));
	2680	+ totalMap.put("fmOtherCount", "");
	2681	+ totalMap.put("huiYinFullCount", String.valueOf(huiYinFullCount));
	2682	+ totalMap.put("huiYinSpitCount", String.valueOf(huiYinSpitCount));
	2683	+ totalMap.put("siLielevelCount", String.valueOf(siLielevelCount));
	2684	+ totalMap.put("siLielevelYzCount", String.valueOf(siLielevelYzCount));
	2685	+ totalMap.put("huiYingTotalCount", String.valueOf(huiYingTotalCount));
	2686	+ totalMap.put("queXianBabyCount", String.valueOf(queXianBabyCount));
	2687	+ totalMap.put("babySiWangCount", "");
	2688	+ totalMap.put("babySiChanCount", String.valueOf(babySiChanCount));
	2689	+ totalMap.put("babySiTaiCount", String.valueOf(babySiTaiCount));
	2690	+ totalMap.put("bigBoyCount", String.valueOf(bigBoyCount));
	2691	+ totalMap.put("lowWeightCount", String.valueOf(lowWeightCount));
	2692	+ totalMap.put("zcBabyCount", String.valueOf(zcBabyCount));
	2693	+ totalMap.put("bswsCount", String.valueOf(bswsCount));
	2694	+ totalMap.put("wsCount", String.valueOf(wsCount));
2726	2695
2727	2696	//各个区总和计算
2728		- for (int i = 1 ; i <= basicConfigs.size() ; i++)
2729		- {
	2697	+ for (int i = 1; i <= basicConfigs.size(); i++) {
2730	2698	int total = 0;
2731		- for (Map<String,String> map : list)
2732		- {
2733		- total += Integer.parseInt(map.get("areaCount"+i));
	2699	+ for (Map<String, String> map : list) {
	2700	+ total += Integer.parseInt(map.get("areaCount" + i));
2734	2701	}
2735		- totalMap.put("areaCount"+i,String.valueOf(total));
	2702	+ totalMap.put("areaCount" + i, String.valueOf(total));
2736	2703	}
2737	2704
2738		- totalMap.put("sieveCount","");
2739		- totalMap.put("sieveFreeCount","");
	2705	+ totalMap.put("sieveCount", "");
	2706	+ totalMap.put("sieveFreeCount", "");
2740	2707	list.add(totalMap);
2741	2708	}
2742	2709	}

...	...	@@ -35,7 +35,36 @@
35	35	private String patientId;
36	36	//畸形key
37	37	private String deformityKey;
	38	+ //判断是否是巨大儿
	39	+ private Integer huge;
38	40
	41	+ private String asphyxiaMStart;
	42	+
	43	+ private String asphyxiaMEnd;
	44	+
	45	+ public String getAsphyxiaMStart() {
	46	+ return asphyxiaMStart;
	47	+ }
	48	+
	49	+ public void setAsphyxiaMStart(String asphyxiaMStart) {
	50	+ this.asphyxiaMStart = asphyxiaMStart;
	51	+ }
	52	+
	53	+ public String getAsphyxiaMEnd() {
	54	+ return asphyxiaMEnd;
	55	+ }
	56	+
	57	+ public void setAsphyxiaMEnd(String asphyxiaMEnd) {
	58	+ this.asphyxiaMEnd = asphyxiaMEnd;
	59	+ }
	60	+
	61	+ public Integer getHuge() {
	62	+ return huge;
	63	+ }
	64	+
	65	+ public void setHuge(Integer huge) {
	66	+ this.huge = huge;
	67	+ }
39	68
40	69	public String getDeformityKey() {
41	70	return deformityKey;