From 266f63d194adbc971990cbae718a94bd7d63e42f Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 25 Apr 2017 10:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ReportController.java | 50 +++++++++++----------- .../web/service/impl/ReportServiceImpl.java | 50 ++++++++++++++++++++-- 2 files changed, 72 insertions(+), 28 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index faacd65..0baff88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -55,12 +55,12 @@ public class ReportController extends BaseController { * @param childBirth */ @RequestMapping(value = "/check/export", method = RequestMethod.GET) -// @TokenRequired + @TokenRequired public void exportCheck(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth, HttpServletRequest request, HttpServletResponse resp) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId(), resp); - reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, 753, resp); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, loginState.getId(), resp); +// reportService.exportCheck(startDate, endDate, startWeek, endWeek, childBirth, 753, resp); } /** @@ -77,13 +77,13 @@ public class ReportController extends BaseController { * @return */ @RequestMapping(method = RequestMethod.GET,value = "/checkInfo") -// @TokenRequired + @TokenRequired @ResponseBody public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer currentPage, Integer pageSize, HttpServletRequest request) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), currentPage, pageSize); - return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, currentPage, pageSize); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), currentPage, pageSize); +// return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, currentPage, pageSize); } /** @@ -98,12 +98,12 @@ public class ReportController extends BaseController { * @return */ @RequestMapping(method = RequestMethod.GET,value = "/checkInfo/export") -// @TokenRequired + @TokenRequired public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, HttpServletRequest request, HttpServletResponse resp) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp); - reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp); +// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp); } @@ -119,8 +119,8 @@ public class ReportController extends BaseController { @TokenRequired public BaseObjectResponse doctorMedical(String startDate, String endDate, Integer childBirth, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// return reportService.doctorMedical(startDate, endDate, childBirth, loginState.getId()); - return reportService.doctorMedical(startDate, endDate, childBirth, 753); + return reportService.doctorMedical(startDate, endDate, childBirth, loginState.getId()); +// return reportService.doctorMedical(startDate, endDate, childBirth, 753); } /** @@ -136,12 +136,12 @@ public class ReportController extends BaseController { */ @RequestMapping(method = RequestMethod.GET,value = "/doctorInfo") @ResponseBody -// @TokenRequired + @TokenRequired public BaseObjectResponse doctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name, Integer currentPage, Integer pageSize, HttpServletRequest request) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// return reportService.doctorInfo(startDate, endDate, childBirth, number, name,currentPage, pageSize, loginState.getId()); - return reportService.doctorInfo(startDate, endDate, childBirth, number, name,currentPage, pageSize, 753); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return reportService.doctorInfo(startDate, endDate, childBirth, number, name,currentPage, pageSize, loginState.getId()); +// return reportService.doctorInfo(startDate, endDate, childBirth, number, name,currentPage, pageSize, 753); } /** @@ -154,12 +154,12 @@ public class ReportController extends BaseController { * @return */ @RequestMapping(method = RequestMethod.GET,value = "/doctorInfo/export") -// @TokenRequired + @TokenRequired public void exportDoctorInfo(String startDate, String endDate, Integer childBirth, Integer number, String name, HttpServletRequest request, HttpServletResponse resp) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// reportService.exportDoctorInfo(startDate, endDate, childBirth, number, name, loginState.getId(), resp); - reportService.exportDoctorInfo(startDate, endDate, childBirth, number, name, 753, resp); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + reportService.exportDoctorInfo(startDate, endDate, childBirth, number, name, loginState.getId(), resp); +// reportService.exportDoctorInfo(startDate, endDate, childBirth, number, name, 753, resp); } /** @@ -173,9 +173,9 @@ public class ReportController extends BaseController { @TokenRequired public void exportDoctor(String startDate, String endDate, Integer childBirth, HttpServletRequest request, HttpServletResponse resp) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// reportService.exportDoctor(startDate, endDate, childBirth, loginState.getId(), resp); - reportService.exportDoctor(startDate, endDate, childBirth, 753, resp); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + reportService.exportDoctor(startDate, endDate, childBirth, loginState.getId(), resp); +// reportService.exportDoctor(startDate, endDate, childBirth, 753, resp); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 4f9c8b4..a4de70e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -29,6 +29,16 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Autowired AutoMatchFacade autoMatchFacade; + private static final Map colorMap = new HashMap<>(); + + static { + colorMap.put("绿色预警", "#50e39f"); + colorMap.put("黄色预警", "#ffd84d"); + colorMap.put("橙色预警", "#f17d02"); + colorMap.put("红色预警", "#ff6767"); + colorMap.put("紫色预警", "#be75ff"); + } + @Override public BaseObjectResponse areaCountFacade(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth, Integer userId) { BaseObjectResponse rest = new BaseObjectResponse(); @@ -48,13 +58,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse doctorMedical(String startDate, String endDate, Integer childBirth, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); BaseObjectResponse rest = new BaseObjectResponse(); ReportModel reportModel = new ReportModel(); List params = new ArrayList<>(); List doctorNames = new ArrayList<>(); List doctorInfo = new ArrayList<>(); - List> restList = reportDao.findList(getDoctorMedicalSql(startDate, endDate, childBirth, params), params); + List> restList = reportDao.findList(getDoctorMedicalSql(startDate, endDate, childBirth, hospitalId, params), params); List> grid = createDoctorGrid(restList, doctorNames, doctorInfo); @@ -146,10 +157,30 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List params = new ArrayList<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); PageResult page = findPage(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), currentPage, pageSize, params); + List> grid = (List>) page.getGrid(); + setColor(grid); rest.setData(page); return rest; } + private void setColor(List> grid) { + Iterator> iterator = grid.iterator(); + while (iterator.hasNext()) { + Map map = iterator.next(); + List colors = new ArrayList<>(); + Object highRiskGrade = map.get("HIGH_RISK_GRADE"); + if(highRiskGrade != null && StringUtils.isNotBlank(highRiskGrade.toString())) { + List grades = Arrays.asList(highRiskGrade.toString()); + for (String grade : grades) { + if(colorMap.get(grade) != null) { + colors.add(colorMap.get(grade)); + } + } + map.put("HIGH_RISK_GRADE", colors); + } + } + } + @Override public void exportCheck(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth, Integer userId, HttpServletResponse resp) { BaseObjectResponse rest = areaCountFacade(startDate, endDate, startWeek, endWeek, childBirth, userId); @@ -231,6 +262,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List params = new ArrayList<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); PageResult page = findPage(getDoctorInfoSql(startDate, endDate, childBirth, number, name, hospitalId, params), currentPage, pageSize, params); + List> grid = (List>) page.getGrid(); + System.err.println("1>> " + grid); + setColor(grid); + System.err.println("2>> " + grid); rest.setData(page); return rest; } @@ -481,7 +516,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService return sql.toString(); } - private String getDoctorMedicalSql(String startDate, String endDate, Integer childBirth, List params) { + private String getDoctorMedicalSql(String startDate, String endDate, Integer childBirth, String hospitalId, List params) { StringBuilder sql = new StringBuilder(); sql.append("SELECT B.DOCTOR_NAME, ") .append("COUNT(B.EXAMINE_ID) AS CJ_RC, ") @@ -506,13 +541,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService params.add(endDate); } + if(StringUtils.isNotBlank(hospitalId)) { + sql.append("AND C.YCY_STSTEM_ID = ? "); + params.add(hospitalId); + } + /* if(startWeek != null && endWeek != null) { sql.append("AND A.NOW_WEEKS BETWEEN ? AND ? "); params.add(startWeek); params.add(endWeek); }*/ - sql.append("GROUP BY B.DOCTOR_NAME,B.DOCTOR_NO ") .append("UNION ALL ") .append("SELECT '总计', ") @@ -531,6 +570,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService params.add(childBirth); } + if(StringUtils.isNotBlank(hospitalId)) { + sql.append("AND C.YCY_STSTEM_ID = ? "); + params.add(hospitalId); + } + if(startDate != null && endDate != null) { sql.append("AND A.CREATE_DATE BETWEEN to_date(?,'yyyy-mm-dd') AND to_date(?,'yyyy-mm-dd') "); params.add(startDate); -- 1.8.3.1