diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java index 92495d4..a78fe21 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java @@ -47,6 +47,8 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative * 预约联系结果(1-成功、2-失败) */ private Integer contactResult; + + private List contactResultList; /** * 预约访视类型(1-上门访视、2-电话访视) */ @@ -75,6 +77,7 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative * 访视结果(1-成功、2-失败) */ private Integer visitResult; + /** * 访视失败理由(1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他) */ @@ -210,6 +213,14 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative private Date updateDateStart; private Date updateDateEnd; + public List getContactResultList() { + return contactResultList; + } + + public void setContactResultList(List contactResultList) { + this.contactResultList = contactResultList; + } + public Date getUpdateDateStart() { return updateDateStart; } @@ -266,6 +277,9 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative if (null != hospitalIds && hospitalIds.size() > 0) { condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); } + if (null != contactResultList && contactResultList.size() > 0) { + condition = condition.and("contactResult", contactResultList, MongoOper.IN); + } if (StringUtils.isNotBlank(deliverId)) { condition = condition.and("deliverId", deliverId, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java index e3db8fb..06c89be 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java @@ -98,7 +98,6 @@ public class annualReportFacade { Map> map = new LinkedHashMap<>(); for (String area : listArea) { List hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area); - System.out.println("==========>" + area); map.put(area, hospitalIds); } @@ -338,6 +337,9 @@ public class annualReportFacade { List hivList = new ArrayList<>(); hivList.add("yang"); hivList.add("yin"); + List contactResult = new ArrayList<>(); + contactResult.add(1); + contactResult.add(2); Integer patientCountSum = 0; Integer babyCountSum = 0; for (Map.Entry> entry : hospitalIdMap.entrySet()) { @@ -345,8 +347,7 @@ public class annualReportFacade { //机构名称 BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class); map.put("orgName", basicConfig.getName()); - System.out.println("==============>id" + basicConfig.getId()); - + System.out.println(basicConfig.getId()); //活产数 BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setDataStatus(false); @@ -640,13 +641,22 @@ public class annualReportFacade { map.put("diacrisisYangPervent", this.division(diacrisisYangCount, diacrisisCount)); //产妇产后访视 人数 - MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery(); + MatDeliverQuery matDeliverQueryFs = new MatDeliverQuery(); + matDeliverQueryFs.setFmHospitalList(entry.getValue()); + matDeliverQueryFs.setVisitStatus(2); + if (StringUtils.isNotEmpty(time)) { + matDeliverQueryFs.setCreatedStart(DateUtil.getSNDate(time)[0]); + matDeliverQueryFs.setEndStart(DateUtil.getSNDate(time)[1]); + } + int visitCount = matDeliverService.count(matDeliverQueryFs); + /*MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery(); if (StringUtils.isNotEmpty(time)) { matDeliverFollowQuery.setCreatedTimeStart(DateUtil.getSNDate(time)[0]); matDeliverFollowQuery.setCreatedTimeEnd(DateUtil.getSNDate(time)[1]); } matDeliverFollowQuery.setHospitalIds(entry.getValue()); - int visitCount = matDeliverFollowService.count(matDeliverFollowQuery); + matDeliverFollowQuery.setContactResultList(contactResult);*/ + //int visitCount = matDeliverFollowService.count(matDeliverFollowQuery); map.put("visitCount", String.valueOf(visitCount)); map.put("visitPervent", this.division(visitCount, chanCount)); //产妇系统管理 人数 @@ -718,7 +728,7 @@ public class annualReportFacade { int chuXueCount = matDeliverService.count(matDeliverKillQuery1); map.put("chuXueCount", String.valueOf(chuXueCount)); - map.put("chuXuePervent", this.division(chuXueCount, killCount)); + map.put("chuXuePervent", this.division(chuXueCount, chanCount)); //孕产妇死亡原因 //妊娠高血压疾病