jiangjiazhi / regional-platform

Commit 823decd20c345649e902ed8e62c31f997fe4ec7b

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

产检次数详情统计

Showing 4 changed files with 49 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java

...	...	@@ -61,7 +61,6 @@
61	61	* @param childBirth 统计范围 1=孕妇 3=产妇不传=全部
62	62	* @return
63	63	*/
64		-// @RequestMapping(method = RequestMethod.GET, value = "/getCheckNumber")
65	64	@RequestMapping(method = RequestMethod.GET, value = "/getCheckStatistics")
66	65	@ResponseBody
67	66	@TokenRequired
68	67
69	68
...	...	@@ -69,12 +68,35 @@
69	68	Integer startWeek, Integer endWeek, Integer childBirth, HttpServletRequest request) {
70	69	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
71	70	return reportService.getCheckNumber(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId());
72		-// return reportService.areaCountFacade(startDate, endDate, startWeek, endWeek, childBirth, 753);
73	71	}
74	72
	73	+ /**
	74	+ * 孕产妇明细查看
	75	+ *
	76	+ * @param startDate 建档开始时间
	77	+ * @param endDate 建档结束时间
	78	+ * @param startWeek 孕周开始时间
	79	+ * @param endWeek 孕周结束时间
	80	+ * @param childBirth 统计范围 1=孕妇 3=产妇不传=全部
	81	+ * @param number 检查次数
	82	+ * @param currentPage 当前页
	83	+ * @param pageSize 每页显示的数量
	84	+ * @return
	85	+ */
	86	+ @RequestMapping(method = RequestMethod.GET, value = "/checkInfo")
	87	+// @RequestMapping(method = RequestMethod.GET, value = "/getCheckNumberInfo")
	88	+ @TokenRequired
	89	+ @ResponseBody
	90	+ public BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number,
	91	+ Integer currentPage, Integer pageSize, HttpServletRequest request) {
	92	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	93	+ return reportService.getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, loginState.getId(), currentPage, pageSize);
	94	+ }
75	95
76	96
77	97
	98	+
	99	+
78	100	/**
79	101	* 产检次数分布统计 excel 导出
80	102	*
81	103
...	...	@@ -90,9 +112,9 @@
90	112	HttpServletRequest request, HttpServletResponse resp) {
91	113	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
92	114	reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId(), resp);
93		-// reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, 753, resp);
94	115	}
95	116
	117	+
96	118	/**
97	119	* 孕产妇明细查看
98	120	*
...	...	@@ -107,7 +129,7 @@
107	129	* @param pageSize 每页显示的数量
108	130	* @return
109	131	*/
110		- @RequestMapping(method = RequestMethod.GET, value = "/checkInfo")
	132	+// @RequestMapping(method = RequestMethod.GET, value = "/checkInfo")
111	133	@TokenRequired
112	134	@ResponseBody
113	135	public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number,

...	...	@@ -79,5 +79,7 @@
79	79	BaseObjectResponse patient(Integer userId, String s, String provinceId, String cityId, String year);
80	80
81	81	BaseObjectResponse getCheckNumber(Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer childBirth, Integer userId);
	82	+
	83	+ BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize);
82	84	}

...	...	@@ -1205,6 +1205,21 @@
1205	1205	return rest;
1206	1206	}
1207	1207
	1208	+ @Override
	1209	+ public BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize) {
	1210	+ Map<String, Object> restMap = (Map<String, Object>) getCheckNumber(startDate, endDate, startWeek, endWeek, childBirth, id).getData();
	1211	+ Map<Integer, List<String>> pidMap = (Map<Integer, List<String>>) restMap.get("pidMap");
	1212	+ if(number == null) { /** 为null就查询总数 */
	1213	+ number = 0;
	1214	+ }
	1215	+ List<String> ids = CollectionUtils.getPageIds(pidMap.get(number), currentPage, pageSize);
	1216	+ System.out.println(ids);
	1217	+
	1218	+
	1219	+
	1220	+ return null;
	1221	+ }
	1222	+
1208	1223	private List<Map<String,Object>> getCheckNumerGrid(List<Map<String, Object>> datas, List<Object> yData, Map<Integer, List<String>> pidMap) {
1209	1224	/** key = pid, value = 初诊复诊记录 */
1210	1225	Map<String, List<Map<String, Object>>> userCheckInfo = new HashMap<>();

1	1	package com.lyms.platform.operate.web.utils;
2	2
3		-import com.lyms.platform.pojo.Patients;
4	3	import org.apache.commons.lang3.StringUtils;
5	4	import org.springframework.util.Assert;
6	5
...	...	@@ -158,6 +157,12 @@
158	157	list.add((T) id);
159	158	}
160	159	return list;
	160	+ }
	161	+
	162	+ public static <T> List<T> getPageIds(List<T> data, Integer page, Integer limit) {
	163	+ Integer startIndex = (page - 1) * limit;
	164	+ Integer endIndex = startIndex + limit;
	165	+ return data.subList(startIndex, endIndex);
161	166	}
162	167
163	168	}