shiyang / regional-platform

Download as
Browse Code »

Commit 14a526e917bca52c4e9c77e3934525fb5feedd96

Authored by hujiaqi
1 parent 4299b890c7
Exists in master

修改excel

Showing 3 changed files with 20 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 14a526e
... ... @@ -292,6 +292,7 @@
292 292 public void patientManagerExcel(HttpServletRequest httpServletRequest, @RequestBody PatientManagerRequest patientManagerRequest, HttpServletResponse httpServletResponse) {
293 293 try {
294 294 patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
  295 + patientManagerRequest.setExcel(true);
295 296 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
296 297 @SuppressWarnings("unchecked")
297 298 List<PatientManagerQueryModel> patientManagerQueryModelList = patientFacade.patientManager(patientManagerRequest).getData();
298 299  
299 300  
... ... @@ -303,14 +304,13 @@
303 304 Map<String, String> header = new LinkedHashMap<>();
304 305 header.put("username", "姓名");
305 306 header.put("age", "年龄");
306   - header.put("phone", "联系电话");
307   - header.put("cardNo", "证件号码");
308   - header.put("addressRegister", "户口所在地");
  307 + header.put("buildWeek", "建档孕周");
  308 + header.put("phone", "联系方式");
309 309 header.put("husbandName", "丈夫姓名");
310   - header.put("husbandAddressRegister", "丈夫户口所在地");
  310 + header.put("address", "居住地");
  311 + header.put("addressRegister", "户籍地");
311 312 header.put("bookbuildingDate", "建档时间");
312 313 header.put("bookbuildingDoctor", "建档医生");
313   - header.put("serviceType", "服务类型");
314 314 httpServletResponse.setContentType("application/force-download");
315 315 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1"));
316 316 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 14a526e
... ... @@ -758,8 +758,11 @@
758 758  
759 759 PatientsQuery patientsQuery = new PatientsQuery();
760 760 patientsQuery.setYn(YnEnums.YES.getId());
761   - patientsQuery.setLimit(patientManagerRequest.getLimit());
762   - patientsQuery.setPage(patientManagerRequest.getPage());
  761 + if (!patientManagerRequest.isExcel()) {
  762 + patientsQuery.setNeed("need");
  763 + patientsQuery.setLimit(patientManagerRequest.getLimit());
  764 + patientsQuery.setPage(patientManagerRequest.getPage());
  765 + }
763 766 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
764 767 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
765 768 patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
... ... @@ -778,7 +781,6 @@
778 781 patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId());
779 782 patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId());
780 783 patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId());
781   - patientsQuery.setNeed("need");
782 784 if (StringUtils.isNotEmpty(patientManagerRequest.getBookBuildingDate())) {
783 785 try {
784 786 patientsQuery.setBookbuildingDateStart(DateUtil.getSNDate(patientManagerRequest.getBookBuildingDate())[0]);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java View file @ 14a526e
... ... @@ -56,6 +56,16 @@
56 56 */
57 57 private String queryNo;
58 58  
  59 + private boolean isExcel;
  60 +
  61 + public boolean isExcel() {
  62 + return isExcel;
  63 + }
  64 +
  65 + public void setExcel(boolean excel) {
  66 + isExcel = excel;
  67 + }
  68 +
59 69 public String getProvinceRegisterId() {
60 70 return provinceRegisterId;
61 71 }