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