jiangjiazhi / regional-platform

Commit d86209acaa210dcaf4aa42ee00e5b95db957d1b2

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产检节点统计

Showing 4 changed files with 106 additions and 33 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java

...	...	@@ -436,7 +436,7 @@
436	436	{
437	437	AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
438	438	antExRecordQuery.setParentIds(ids);
439		- for (int i = 0 ; i < 5 ; i++)
	439	+ for (int i = 0 ; i < 7 ; i++)
440	440	{
441	441	if (i == 0)
442	442	{
443	443
444	444
445	445
446	446
...	...	@@ -445,20 +445,30 @@
445	445	}
446	446	else if (i == 1)
447	447	{
	448	+ antExRecordQuery.setcDueWeekStart(13*7);
	449	+ antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1);
	450	+ }
	451	+ else if (i == 2)
	452	+ {
448	453	antExRecordQuery.setcDueWeekStart(16*7);
449	454	antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1);
450	455	}
451		- else if (i == 2)
	456	+ else if (i == 3)
452	457	{
453	458	antExRecordQuery.setcDueWeekStart(21*7);
454	459	antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1);
455	460	}
456		- else if (i == 3)
	461	+ else if (i == 4)
457	462	{
	463	+ antExRecordQuery.setcDueWeekStart(25*7);
	464	+ antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1);
	465	+ }
	466	+ else if (i == 5)
	467	+ {
458	468	antExRecordQuery.setcDueWeekStart(28*7);
459	469	antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1);
460	470	}
461		- else if (i == 4)
	471	+ else if (i == 6)
462	472	{
463	473	antExRecordQuery.setcDueWeekStart(37*7);
464	474	antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);

...	...	@@ -51,9 +51,6 @@
51	51	private AntExRecordService recordService;
52	52
53	53	@Autowired
54		- private AutoMatchFacade autoMatchFacade;
55		-
56		- @Autowired
57	54	private DataPermissionService dataPermissionService;
58	55
59	56	@Autowired
60	57
...	...	@@ -186,8 +183,10 @@
186	183	}
187	184	List<String> chartData = new ArrayList<>();
188	185	List<Integer> num12 = new ArrayList<>();
	186	+ List<Integer> num15 = new ArrayList<>();
189	187	List<Integer> num20 = new ArrayList<>();
190	188	List<Integer> num24 = new ArrayList<>();
	189	+ List<Integer> num27 = new ArrayList<>();
191	190	List<Integer> num36 = new ArrayList<>();
192	191	List<Integer> num40 = new ArrayList<>();
193	192
194	193
195	194
196	195
197	196
198	197
199	198
...	...	@@ -224,31 +223,35 @@
224	223	for (Map<String, Object> map : checkPointtList) {
225	224	chartData.add(map.get("HOSPITAL_NAME").toString());
226	225	num12.add(getInteger(map.get("NUM_12")));
227		- num20.add(getInteger(map.get("NUM_16")));
	226	+ num15.add(getInteger(map.get("NUM_15")));
	227	+ num20.add(getInteger(map.get("NUM_20")));
228	228	num24.add(getInteger(map.get("NUM_24")));
	229	+ num27.add(getInteger(map.get("NUM_27")));
229	230	num36.add(getInteger(map.get("NUM_36")));
230	231	num40.add(getInteger(map.get("NUM_40")));
231	232	}
232	233	}
233	234	else if (StringUtils.isNotEmpty(cityId))
234	235	{
235		- getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"AREA_COUNTY_ID","AREA_COUNTY");
	236	+ getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"AREA_COUNTY_ID","AREA_COUNTY");
236	237	}
237	238	else if (StringUtils.isNotEmpty(provinceId))
238	239	{
239		- getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"CITY_ID","CITY");
	240	+ getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"CITY_ID","CITY");
240	241	}
241	242	else
242	243	{
243		- getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"PROVINCE_ID","PROVINCE");
	244	+ getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"PROVINCE_ID","PROVINCE");
244	245	}
245	246
246	247	Map<String, Object> data = new HashMap<>();
247	248	data.put("list", checkPointtList);
248	249	data.put("chartData", chartData);
249	250	data.put("num12", num12);
	251	+ data.put("num15", num15);
250	252	data.put("num20", num20);
251	253	data.put("num24", num24);
	254	+ data.put("num27", num27);
252	255	data.put("num36", num36);
253	256	data.put("num40", num40);
254	257	return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
...	...	@@ -256,8 +259,8 @@
256	259
257	260
258	261	private void getData(List<Map<String, Object>> checkPointtList,
259		- List<Integer> num12,List<Integer> num20,
260		- List<Integer> num24,List<Integer> num36,
	262	+ List<Integer> num12, List<Integer> num15,List<Integer> num20,
	263	+ List<Integer> num24,List<Integer> num27,List<Integer> num36,
261	264	List<Integer> num40,List<String> chartData,
262	265	String idKey,String nameKey
263	266	)
264	267
265	268
...	...	@@ -276,15 +279,26 @@
276	279	result.put(key, getInteger(map.get("NUM_12")));
277	280	}
278	281
279		- String key1 = "num16:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
	282	+ String key15 = "num15:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
	283	+ if (result.get(key15) != null)
	284	+ {
	285	+ Integer value = result.get(key15);
	286	+ result.put(key15,value+getInteger(map.get("NUM_15")));
	287	+ }
	288	+ else
	289	+ {
	290	+ result.put(key15, getInteger(map.get("NUM_15")));
	291	+ }
	292	+
	293	+ String key1 = "num20:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
280	294	if (result.get(key1) != null)
281	295	{
282	296	Integer value = result.get(key1);
283		- result.put(key1,value+getInteger(map.get("NUM_16")));
	297	+ result.put(key1,value+getInteger(map.get("NUM_20")));
284	298	}
285	299	else
286	300	{
287		- result.put(key1, getInteger(map.get("NUM_16")));
	301	+ result.put(key1, getInteger(map.get("NUM_20")));
288	302	}
289	303
290	304	String key2 = "num24:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
...	...	@@ -298,6 +312,18 @@
298	312	result.put(key2, getInteger(map.get("NUM_24")));
299	313	}
300	314
	315	+
	316	+ String key27 = "num27:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
	317	+ if (result.get(key27) != null)
	318	+ {
	319	+ Integer value = result.get(key27);
	320	+ result.put(key27,value+getInteger(map.get("NUM_27")));
	321	+ }
	322	+ else
	323	+ {
	324	+ result.put(key27, getInteger(map.get("NUM_27")));
	325	+ }
	326	+
301	327	String key3 = "num36:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
302	328	if (result.get(key3) != null)
303	329	{
...	...	@@ -309,7 +335,6 @@
309	335	result.put(key3, getInteger(map.get("NUM_36")));
310	336	}
311	337
312		-
313	338	String key4 = "num40:"+map.get(idKey).toString()+":"+map.get(nameKey).toString();
314	339	if (result.get(key4) != null)
315	340	{
316	341
317	342
...	...	@@ -333,14 +358,22 @@
333	358	{
334	359	num12.add(result.get(key));
335	360	}
336		- else if (key.contains("num16"))
	361	+ else if (key.contains("num15"))
337	362	{
338	363	num20.add(result.get(key));
339	364	}
	365	+ else if (key.contains("num20"))
	366	+ {
	367	+ num20.add(result.get(key));
	368	+ }
340	369	else if (key.contains("num24"))
341	370	{
342	371	num24.add(result.get(key));
343	372	}
	373	+ else if (key.contains("num27"))
	374	+ {
	375	+ num24.add(result.get(key));
	376	+ }
344	377	else if (key.contains("num36"))
345	378	{
346	379	num36.add(result.get(key));
...	...	@@ -537,7 +570,7 @@
537	570	* @param page
538	571	* @param limit
539	572	* @param userId
540		- * @param nodeName 0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～分娩
	573	+ * @param nodeName 0:0～12 孕周 1:13-15 2: 16～20 孕周 3: 21～24 孕周 4:25-27 5:28～36 孕周 6:37～ 40
541	574	* @return
542	575	*/
543	576	public BaseResponse getCheckDetail(Integer nodeType, String time, String hospitalId,
544	577
545	578
546	579
547	580
...	...	@@ -589,20 +622,30 @@
589	622	}
590	623	else if (nodeName == 1)
591	624	{
	625	+ antExRecordQuery.setcDueWeekStart(13*7);
	626	+ antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1);
	627	+ }
	628	+ else if (nodeName == 2)
	629	+ {
592	630	antExRecordQuery.setcDueWeekStart(16*7);
593	631	antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1);
594	632	}
595		- else if (nodeName == 2)
	633	+ else if (nodeName == 3)
596	634	{
597	635	antExRecordQuery.setcDueWeekStart(21*7);
598	636	antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1);
599	637	}
600		- else if (nodeName == 3)
	638	+ else if (nodeName == 4)
601	639	{
	640	+ antExRecordQuery.setcDueWeekStart(25*7);
	641	+ antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1);
	642	+ }
	643	+ else if (nodeName == 5)
	644	+ {
602	645	antExRecordQuery.setcDueWeekStart(28*7);
603	646	antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1);
604	647	}
605		- else if (nodeName == 4)
	648	+ else if (nodeName == 6)
606	649	{
607	650	antExRecordQuery.setcDueWeekStart(37*7);
608	651	antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);

...	...	@@ -24,11 +24,13 @@
24	24
25	25	private static List<Integer> weeks = new ArrayList<>();
26	26	static {
27		- weeks.add(0);
28		- weeks.add(16);
29		- weeks.add(21);
30		- weeks.add(28);
31		- weeks.add(37);
	27	+ weeks.add(12);
	28	+ weeks.add(15);
	29	+ weeks.add(20);
	30	+ weeks.add(24);
	31	+ weeks.add(27);
	32	+ weeks.add(36);
	33	+ weeks.add(40);
32	34	}
33	35	private static ExecutorService pool = Executors.newFixedThreadPool(5);
34	36	private PatientsService patientsService;
35	37
...	...	@@ -127,8 +129,10 @@
127	129
128	130
129	131	int itemnum12 = result.get("itemnum12");
	132	+ int itemnum15 = result.get("itemnum15");
130	133	int itemnum20 = result.get("itemnum20");
131	134	int itemnum24 = result.get("itemnum24");
	135	+ int itemnum27 = result.get("itemnum27");
132	136	int itemnum36 = result.get("itemnum36");
133	137	int itemnum40 = result.get("itemnum40");
134	138	int cjNum = itemnum12+itemnum20+itemnum24+itemnum36+itemnum40;
135	139
...	...	@@ -139,8 +143,10 @@
139	143	map.put("JD_NUM", buildCount);
140	144	map.put("CJ_NUM", cjNum);
141	145	map.put("NUM_12", itemnum12);
	146	+ map.put("NUM_15", itemnum15);
142	147	map.put("NUM_16", itemnum20);
143	148	map.put("NUM_24", itemnum24);
	149	+ map.put("NUM_27", itemnum27);
144	150	map.put("NUM_36", itemnum36);
145	151	map.put("NUM_40", itemnum40);
146	152	checkPointtList.add(map);

...	...	@@ -58,36 +58,50 @@
58	58	antExRecordQuery.setIsFirst(pointType);
59	59	}
60	60
61		- if (week == 0)
	61	+ if (week == 12)
62	62	{
63		-
64	63	antExRecordQuery.setcDueWeekStart(0);
65	64	antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1);
66	65	int itemnum12 = recordService.count(antExRecordQuery);
67	66	map.put("itemnum12",itemnum12);
68	67	}
69		- else if (week == 16)
	68	+
	69	+ else if (week == 15)
70	70	{
	71	+ antExRecordQuery.setcDueWeekStart(13*7);
	72	+ antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1);
	73	+ int itemnum15 = recordService.count(antExRecordQuery);
	74	+ map.put("itemnum15",itemnum15);
	75	+ }
	76	+ else if (week == 20)
	77	+ {
71	78	antExRecordQuery.setcDueWeekStart(16*7);
72	79	antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1);
73	80	int itemnum20 = recordService.count(antExRecordQuery);
74	81	map.put("itemnum20",itemnum20);
75	82	}
76		- else if (week == 21)
	83	+ else if (week == 24)
77	84	{
78	85	antExRecordQuery.setcDueWeekStart(21*7);
79	86	antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1);
80	87	int itemnum24 = recordService.count(antExRecordQuery);
81	88	map.put("itemnum24",itemnum24);
82	89	}
83		- else if (week == 28)
	90	+ else if (week == 27)
84	91	{
	92	+ antExRecordQuery.setcDueWeekStart(25*7);
	93	+ antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1);
	94	+ int itemnum27 = recordService.count(antExRecordQuery);
	95	+ map.put("itemnum27",itemnum27);
	96	+ }
	97	+ else if (week == 36)
	98	+ {
85	99	antExRecordQuery.setcDueWeekStart(28*7);
86	100	antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1);
87	101	int itemnum36 = recordService.count(antExRecordQuery);
88	102	map.put("itemnum36",itemnum36);
89	103	}
90		- else if (week == 37)
	104	+ else if (week == 40)
91	105	{
92	106	antExRecordQuery.setcDueWeekStart(37*7);
93	107	antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);