jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a870a69df77a70b36b3b459e106d2b5549c6d207

Authored by liquanyu
1 parent 33206d3cd6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇课程调查

Showing 3 changed files with 18 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java View file @ a870a69
... ... @@ -21,7 +21,7 @@
21 21 //课程名称
22 22 private String courseName;
23 23  
24   - //课程主讲
  24 + //课程主讲id
25 25 private String courseSpeaker;
26 26  
27 27 //课程地址
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ a870a69
... ... @@ -322,6 +322,7 @@
322 322 @SuppressWarnings("unchecked")
323 323 List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest).getData();
324 324 List<Map<String, Object>> list = new ArrayList<>();
  325 + int num = 1;
325 326 for (NewBabyManagerQueryModel newBabyManagerQueryModel : newBabyManagerQueryModelList) {
326 327 Map<String, Object> map = BeanUtils.objectToObjectMap(newBabyManagerQueryModel);
327 328 String sex = newBabyManagerQueryModel.getSex();
... ... @@ -362,7 +363,7 @@
362 363 String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
363 364 patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
364 365  
365   - map.put("addressRegister",liveAddress);
  366 + map.put("liveAddress",liveAddress);
366 367  
367 368 //户籍地址
368 369 String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
369 370  
370 371  
... ... @@ -402,10 +403,12 @@
402 403  
403 404 map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark());
404 405 }
405   -
  406 + map.put("num", num);
406 407 list.add(map);
  408 + num++;
407 409 }
408 410 Map<String, String> header = new LinkedHashMap<>();
  411 + header.put("num", "编号");
409 412 header.put("mname", "产妇姓名");
410 413 header.put("age", "年龄");
411 414 header.put("name", "儿童姓名");
... ... @@ -414,7 +417,7 @@
414 417 header.put("babyWeight", "体重g");
415 418 header.put("fmDate", "出生时间(具体到分)");
416 419 header.put("addressRegister", "产妇户籍地");
417   - header.put("addressRegister","居住地");
  420 + header.put("liveAddress","居住地");
418 421 header.put("postRest", "产后休养地址");
419 422 header.put("risk", "妊娠期高危因素");
420 423 header.put("mphone", "联系方式");
... ... @@ -433,7 +436,7 @@
433 436 header.put("fmHospital","接生医院");
434 437 header.put("mremark", "备注");
435 438 httpServletResponse.setContentType("application/force-download");
436   - httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿管理.xls").getBytes("UTF-8"), "ISO-8859-1"));
  439 + httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿出生电子报告卡.xls").getBytes("UTF-8"), "ISO-8859-1"));
437 440 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
438 441 } catch (Exception e) {
439 442 ExceptionUtils.catchException(e, "childbirthManagerExcel异常");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ a870a69
... ... @@ -190,7 +190,16 @@
190 190 result.setCourseTypeId(model.getCourseTypeId());
191 191  
192 192 result.setCourseName(model.getCourseName());
193   - result.setCourseSpeaker(model.getCourseSpeaker());
  193 + String courseSpeakerName = model.getCourseSpeaker();
  194 + if (model.getCourseSpeaker() != null && StringUtils.isNumeric(model.getCourseSpeaker()))
  195 + {
  196 + Users user = usersService.getUsers(Integer.parseInt(model.getCourseSpeaker()));
  197 + if (user != null)
  198 + {
  199 + courseSpeakerName = user.getName();
  200 + }
  201 + }
  202 + result.setCourseSpeaker(courseSpeakerName);
194 203 result.setCourseAddress(model.getCourseAddress());
195 204 result.setCourseTime(DateUtil.gety_m_dhm(model.getCourseTime()));
196 205 result.setTimeLong(model.getTimeLong());