From 3b82aa02593f3bf88e0162b5a089a9b443ad1bbd Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 16 Oct 2017 13:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=8A=82=E7=82=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/AreaCountFacade.java | 6 +++++- .../com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java | 5 ++++- 2 files changed, 9 insertions(+), 2 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 2f121f4..25077ae 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 @@ -568,7 +568,11 @@ public class AreaCountFacade { antExRecordQuery.setPage(page); antExRecordQuery.setLimit(limit); antExRecordQuery.setNeed("true"); - antExRecordQuery.setIsFirst(nodeType); + if (nodeType != null && nodeType == 1) + { + antExRecordQuery.setIsFirst(nodeType); + } + if (nodeName != null) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java index 5e7de2d..a9b6033 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java @@ -53,7 +53,10 @@ public class CheckWeeksNumWorker implements Callable> { antExRecordQuery.setBirthStart(startTime); antExRecordQuery.setBuildTimeEnd(endTime); antExRecordQuery.setHospitalId(hospitalId); - antExRecordQuery.setIsFirst(pointType); + if (pointType != null && pointType == 1) + { + antExRecordQuery.setIsFirst(pointType); + } if (week == 0) { -- 1.8.3.1