From dde1d376c6029a5e9ac9d00f2789ea37372a34e2 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Fri, 31 May 2019 19:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AreaCountFacade.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 2d01356..176d693 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1505,8 +1505,6 @@ public class AreaCountFacade { healthChargeQuery.setCreatedStart(startTime); healthChargeQuery.setCreatedEnd(endTime); healthChargeQuery.setYn(YnEnums.YES.getId()); - - healthChargeQuery.setRemianType("4"); if (StringUtils.isNotEmpty(reportNameType)) { healthChargeQuery.setHealthType(Integer.parseInt(reportNameType)); } @@ -1657,6 +1655,14 @@ public class AreaCountFacade { List hospitalIds = getHospitalIds(query); HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); + // 1体重 2 血糖 3 血压 4妊高症 5-儿童 + String reportNameType = query.getReportNameType(); + if (!"1".equals(reportNameType) && + (!"2".equals(reportNameType)) && + (!"3".equals(reportNameType)) && + (!"5".equals(reportNameType))){ + healthChargeQuery.setRemianType("4"); + } List healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); LinkedList> linkedList = new LinkedList<>(); if (CollectionUtils.isNotEmpty(healthChargeModels)){ @@ -1785,7 +1791,14 @@ public class AreaCountFacade { } HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); - + // 1体重 2 血糖 3 血压 4妊高症 5-儿童 + String reportNameType = query.getReportNameType(); + if (!"1".equals(reportNameType) && + (!"2".equals(reportNameType)) && + (!"3".equals(reportNameType)) && + (!"5".equals(reportNameType))){ + healthChargeQuery.setRemianType("4"); + } List healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); LinkedList> linkedList = new LinkedList<>(); -- 1.8.3.1