jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2651729f7d80d8b013808a4941a4f7c3bc692fb9

Authored by yangfei
2 parents 9157097f6f 66dda887d7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java View file @ 2651729
... ... @@ -84,7 +84,6 @@
84 84 * @return
85 85 */
86 86 @RequestMapping(method = RequestMethod.GET, value = "/checkInfo")
87   -// @RequestMapping(method = RequestMethod.GET, value = "/getCheckNumberInfo")
88 87 @TokenRequired
89 88 @ResponseBody
90 89 public BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number,
91 90  
... ... @@ -93,10 +92,29 @@
93 92 return reportService.getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, loginState.getId(), currentPage, pageSize);
94 93 }
95 94  
  95 + /**
  96 + * 产检次数详情导出
  97 + *
  98 + * @param startDate 建档开始时间
  99 + * @param endDate 建档结束时间
  100 + * @param startWeek 孕周开始时间
  101 + * @param endWeek 孕周结束时间
  102 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部
  103 + * @param number 检查次数
  104 + * @return
  105 + */
  106 + @RequestMapping(method = RequestMethod.GET, value = "/doctorInfo/export")
  107 + @TokenRequired
  108 + @ResponseBody
  109 + public void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, HttpServletResponse resp, HttpServletRequest request) {
  110 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  111 + reportService.checkNumberInfoExport(childBirth, startDate, endDate, startWeek, endWeek, number, loginState.getId(), resp);
  112 + }
96 113  
97 114  
98 115  
99 116  
  117 +
100 118 /**
101 119 * 产检次数分布统计 excel 导出
102 120 *
103 121  
... ... @@ -152,11 +170,10 @@
152 170 */
153 171 @RequestMapping(method = RequestMethod.GET, value = "/checkInfo/export")
154 172 @TokenRequired
155   - public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number,
  173 + public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number,
156 174 String name, HttpServletRequest request, HttpServletResponse resp) {
157 175 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
158 176 reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp);
159   -// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp);
160 177 }
161 178  
162 179  
... ... @@ -209,7 +226,7 @@
209 226 * @param name 医生名称
210 227 * @return
211 228 */
212   - @RequestMapping(method = RequestMethod.GET, value = "/doctorInfo/export")
  229 +// @RequestMapping(method = RequestMethod.GET, value = "/doctorInfo/export")
213 230 @TokenRequired
214 231 public void exportDoctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name,
215 232 HttpServletRequest request, HttpServletResponse resp) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java View file @ 2651729
... ... @@ -66,7 +66,7 @@
66 66  
67 67 void exportDoctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name, Integer userId, HttpServletResponse resp);
68 68  
69   - void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp);
  69 + void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp);
70 70  
71 71 BaseObjectResponse coupon(Map<String, Object> param);
72 72  
... ... @@ -81,5 +81,7 @@
81 81 BaseObjectResponse getCheckNumber(Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer childBirth, Integer userId);
82 82  
83 83 BaseObjectResponse getCheckNumberInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, Integer currentPage, Integer pageSize);
  84 +
  85 + void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, HttpServletResponse resp);
84 86 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 2651729
... ... @@ -435,7 +435,7 @@
435 435 }
436 436  
437 437 @Override
438   - public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) {
  438 + public void exportCheckInfo(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) {
439 439 List<Object> params = new ArrayList<>();
440 440 String hospitalId = autoMatchFacade.getHospitalId(userId);
441 441 Map<String, String> cnames = new LinkedHashMap<>();
442 442  
... ... @@ -451,11 +451,15 @@
451 451 cnames.put("DOCTOR_NAME", "最后产检医生");
452 452  
453 453 List<Map<String,Object>> results = new ArrayList<>();
454   - List<Map<String, Object>> list = reportDao.findList(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), params);
  454 +
  455 + BaseObjectResponse baseObjectResponse = getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, userId, 1, Integer.MAX_VALUE);
  456 + PageResult page = (PageResult) baseObjectResponse.getData();
  457 + List<Map<String, Object>> list = (List<Map<String, Object>>) page.getGrid();
455 458 for (Map<String, Object> map : list) {
456 459 results.add(map);
457 460 }
458 461  
  462 +
459 463 ResponseUtil.responseExcel(cnames,results, resp);
460 464 }
461 465  
... ... @@ -1256,7 +1260,7 @@
1256 1260 String prodDoctor = examinationModel.getCheckDoctor();
1257 1261 if(StringUtils.isNotBlank(prodDoctor)) {
1258 1262 Users users = usersService.getUsers(Integer.parseInt(prodDoctor));
1259   - tempMap.put("LAST_EXAMINE_DATE", users == null ? null : users.getName());
  1263 + tempMap.put("DOCTOR_NAME", users == null ? null : users.getName());
1260 1264 }
1261 1265 } else if(CollectionUtils.isNotEmpty(antExChuModels)) {
1262 1266 AntExChuModel antExChuModel = antExChuModels.get(0);
... ... @@ -1269,7 +1273,7 @@
1269 1273 String prodDoctor = antExChuModel.getProdDoctor();
1270 1274 if(StringUtils.isNotBlank(prodDoctor)) {
1271 1275 Users users = usersService.getUsers(Integer.parseInt(prodDoctor));
1272   - tempMap.put("LAST_EXAMINE_DATE", users == null ? null : users.getName());
  1276 + tempMap.put("DOCTOR_NAME", users == null ? null : users.getName());
1273 1277 }
1274 1278 }
1275 1279  
... ... @@ -1279,6 +1283,32 @@
1279 1283 pageResult.setGrid(rest);
1280 1284 }
1281 1285 return RespBuilder.buildSuccess(pageResult);
  1286 + }
  1287 +
  1288 + @Override
  1289 + public void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer userId, HttpServletResponse resp) {
  1290 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  1291 + Map<String, String> cnames = new LinkedHashMap<>();
  1292 + cnames.put("id", "#");
  1293 + cnames.put("NAME", "姓名");
  1294 + cnames.put("YUNZHOU", "当前孕周");
  1295 + cnames.put("BENYUAN_NUM", "本院产检次数");
  1296 + cnames.put("TOTAL_NUM", "总产检次数");
  1297 + cnames.put("HIGH_RISK_GRADE", "高危等级");
  1298 + cnames.put("HIGH_RISK_FACTOR", "风险因数");
  1299 + cnames.put("EDD_DATE", "预产期/分娩日期");
  1300 + cnames.put("LAST_EXAMINE_DATE", "最后产检日期");
  1301 + cnames.put("DOCTOR_NAME", "最后产检医生");
  1302 +
  1303 + List<Map<String,Object>> results = new ArrayList<>();
  1304 +
  1305 + BaseObjectResponse baseObjectResponse = getCheckNumberInfo(childBirth, startDate, endDate, startWeek, endWeek, number, userId, 1, Integer.MAX_VALUE);
  1306 + PageResult page = (PageResult) baseObjectResponse.getData();
  1307 + List<Map<String, Object>> list = (List<Map<String, Object>>) page.getGrid();
  1308 + for (Map<String, Object> map : list) {
  1309 + results.add(map);
  1310 + }
  1311 + ResponseUtil.responseExcel(cnames,results, resp);
1282 1312 }
1283 1313  
1284 1314 private List<Map<String,Object>> getCheckNumerGrid(List<Map<String, Object>> datas, List<Object> yData, Map<Integer, List<String>> pidMap) {