From ba5b6b8d4641ee9fa46e2dc03e638dc1c4058dc8 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 29 Nov 2017 21:09:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/base/ExceptionHandlerController.java | 2 ++ .../web/service/impl/BloodPressureServiceImpl.java | 1 - .../operate/web/service/impl/ReportServiceImpl.java | 17 +++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java b/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java index fb28ebb..96df0a3 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java +++ b/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java @@ -151,6 +151,8 @@ public class ExceptionHandlerController { Map resultMap = new HashMap<>(); resultMap.put("errorcode", ErrorCodeConstants.SYSTEM_ERROR); resultMap.put("errormsg", "服务器异常."); + resultMap.put("message", e.getMessage()); + resultMap.put("exception", e.getClass()); if(!e.getClass().getSimpleName() .equals("ClientAbortException") ){ ExceptionUtils.catchException(e, "ExceptionHandlerController Exception. queryStr: " +httpServletRequest.getRequestURI() + "?"+httpServletRequest.getQueryString()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 05f19c9..ec664ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -156,7 +156,6 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP pulse.add(infos.containsKey(date) ? (Integer) infos.get(date).get("pulse") : 0); } } - return RespBuilder.buildSuccess("xyInfos", xyInfos, "szyMin", szyMin, "ssyMax", ssyMax, "ssy", ssy, "szy", szy, "pulse", pulse); } 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 916d30e..9a41bf4 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 @@ -439,10 +439,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } private void setCountList(List> tabList, List countList, int index) { - countList.add(tabList.size() + ""); - countList.add("合计"); - countList.add("建档总数"); if(tabList.size() > 1) { + countList.add(tabList.size() + ""); + countList.add("合计"); + if(index == 4) { + int orgCount = 0; + for (int i = 1; i < tabList.size(); i++) { + orgCount += Integer.parseInt(tabList.get(i).get(4)); + } + countList.add(orgCount + ""); + } + countList.add("建档总数"); for (int i = index; i < tabList.get(0).size(); i++) { int count = 0; for (int j = 1; j < tabList.size(); j++) { @@ -450,10 +457,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } countList.add(count + ""); } - + tabList.add(countList); } - tabList.add(countList); - } private void setTabListInfo(List> tabList, int index) { -- 1.8.3.1