From 8f0a2c0c7eb154af3227b6fc5b8699598930e0c6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 9 Nov 2018 17:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E7=BB=9F=E8=AE=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/hospitalapi/rcfy/RcGlxtService.java | 5 ++-- .../operate/web/controller/SieveController.java | 30 +++++++++++++++++++--- .../platform/operate/web/facade/SieveFacade.java | 14 ++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index 8292d03..96f75f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -87,6 +87,7 @@ public class RcGlxtService { hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 // hospitalsMap.put("216","216");//测试用的秦皇岛医院 hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院 + hospitalsMap.put("2100001773","371082006011");//荣成市石岛人民医院 hospitalsMap.put("2100001772","371082007001");//荣成市中医院 hospitalsMap.put("2100001750","371082000011");//荣成市妇幼保健院 @@ -331,7 +332,7 @@ public class RcGlxtService { } } ps.setString(12, status); - ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); + ps.setString(13, hospitalsMap.get(model.getHospitalId())); ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor()); ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor()); ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime())); @@ -393,7 +394,7 @@ public class RcGlxtService { } } ps.setString(12, status); - ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); + ps.setString(13, hospitalsMap.get(model.getHospitalId())); ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor()); ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor()); ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 7e7cde5..d354542 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -7,10 +7,21 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.facade.SieveFacade; import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest; +import com.lyms.platform.operate.web.request.ChildbirthManagerRequest; import com.lyms.platform.operate.web.request.CqSieveQueryRequest; import com.lyms.platform.operate.web.request.SieveAddRequest; +import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel; +import com.lyms.platform.operate.web.result.HighScoreResult; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExChuQuery; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -18,10 +29,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 产筛接口 @@ -289,4 +297,18 @@ public class SieveController extends BaseController { return sieveFacade.queryCqsievesReport(cqSieveQueryRequest, loginState.getId()); } + /** + * 导出威海市孕妇产前筛查和诊断情况月报表 + * @param cqSieveQueryRequest + * @param request + * @param response + */ + @TokenRequired + @RequestMapping(value = "exportSieveReportExcl", method = RequestMethod.POST) + public void exportSieveReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response) { + + sieveFacade.exportSieveReportExcl(cqSieveQueryRequest, getUserId(request), response); + + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 84271fe..436b706 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1327,4 +1327,18 @@ public class SieveFacade { @Autowired private AreaCountFacade areaCountFacade; + + public void exportSieveReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId,HttpServletResponse response) { + +// try { +// +// response.setContentType("application/force-download"); +// response.setHeader("Content-Disposition", "attachment;filename=" + new String(("威海市孕妇产前筛查和诊断情况月报表.xls").getBytes("UTF-8"), "ISO-8859-1")); +// String path = this.getClass().getResource("/").getPath()+ "whfy_sieve.xls"; +// ExcelUtil.writeWhExclFile(path, response.getOutputStream(), list); +// +// } catch (Exception e) { +// ExceptionUtils.catchException(e, "fmRecordExportExcl异常"); +// } + } } \ No newline at end of file -- 1.8.3.1