From 5ffee8629c5b31feed6d976c3f1166cd79ebfb4e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 16 Jan 2018 10:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/AntExRecordQuery.java | 13 ++++++++++++- .../lyms/platform/operate/web/worker/AntExRecordWorker.java | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index c166727..18719ec 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -89,6 +89,15 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private String cityId; private String areaId; private String streetId; + private Integer type; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } public String getStreetRegisterId() { return streetRegisterId; @@ -436,7 +445,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(name)) { condition = condition.and("name", name, MongoOper.IS); } - + if (null != type) { + condition = condition.and("type", type, MongoOper.IS); + } if (isFirst != null) { condition = condition.and("isFirst", isFirst, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index 182fd17..5bb7a1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -125,10 +125,15 @@ public class AntExRecordWorker implements Callable> { //本院低次 int dichi = recordService.count(antExRecordQuery1); + + antExRecordQuery1.setType(1); + //初诊的次数 + int cdichi = recordService.count(antExRecordQuery1); + antExRecordQuery1.setHospitalId(null); antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); - antExManagerResult.setChTimes(dichi); + antExManagerResult.setChTimes(dichi-cdichi); handleRisk(e, antExManagerResult); data.add(antExManagerResult); -- 1.8.3.1