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) {