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 4a2ecdd..4dff14d 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 @@ -103,8 +103,6 @@ public class annualReportFacade { List> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate); - - System.out.println(mapList); this.sum(mapList); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1")); @@ -350,7 +348,6 @@ public class annualReportFacade { //机构名称 BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class); map.put("orgName", basicConfig.getName()); - //活产数 BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setDataStatus(false); @@ -499,8 +496,7 @@ public class annualReportFacade { int j = 0; for (AntExChuModel antExChu : antExChuModels) { if (StringUtils.isNotEmpty(antExChu.getXhdb())) { - System.out.println(antExChu.getXhdb()); - if (Integer.valueOf(antExChu.getXhdb()).intValue() > 100) { + if (Double.valueOf(antExChu.getXhdb()).doubleValue() > 100.0) { ++j; } } @@ -535,7 +531,7 @@ public class annualReportFacade { int hiv = antenatalExaminationService.queryAntExChuCount(antExChuQuery.convertToQuery()); map.put("hivYang", String.valueOf(hiv)); //感染人数的10万分之1 - map.put("hivYangPervent", String.valueOf((double) hiv != 0.0 ? hiv / 100000 : 0)); + map.put("hivYangPervent", String.valueOf(hiv)); //产妇梅毒检测人数 AntExChuQuery veroleChuQuery1 = new AntExChuQuery(); @@ -548,11 +544,8 @@ public class annualReportFacade { veroleChuQuery1.setSyjgList(hivList); int veroleCount = antenatalExaminationService.queryAntExChuCount(veroleChuQuery1.convertToQuery()); map.put("veroleCount", String.valueOf(veroleCount)); - - map.put("verolePervent", this.division(veroleCount, chanCount)); - // AntExChuQuery veroleChuQuery = new AntExChuQuery(); veroleChuQuery.setYn(1); if (StringUtils.isNotEmpty(time)) { @@ -711,8 +704,7 @@ public class annualReportFacade { matDeliverKillQuery.setMaternalInfo("2"); int killCount = matDeliverService.count(matDeliverKillQuery); map.put("killCount", String.valueOf(killCount)); - Double s = (double) killCount != 0.0 ? (double) killCount / 100000 : 0; - map.put("killPervent", String.valueOf(s)); + map.put("killPervent", String.valueOf(killCount)); //产科出血人数 MatDeliverQuery matDeliverKillQuery1 = new MatDeliverQuery(); @@ -865,6 +857,7 @@ public class annualReportFacade { List PregnancyOuts = new ArrayList<>(); PregnancyOuts.add("1"); PregnancyOuts.add("3"); + PregnancyOuts.add("2"); matDeliverQuery10.setPregnancyOuts(PregnancyOuts); matDeliverQuery10.setFmHospitalList(entry.getValue()); @@ -923,12 +916,10 @@ public class annualReportFacade { } public static void main(String[] args) { - double s = 12; + double s = 12.23; double d; - if (s != 0.0) { - d = s / 10000; - System.out.println(d); - } + Integer s1 = (int) s; + System.out.println(s1); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java index 789ed88..a3348f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java @@ -152,7 +152,11 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe keys.add(patients1.getId()); } } else { - return RespBuilder.buildSuccess(null); + List> couponInfos = new ArrayList<>(); + String subTitle = null; + int count = 0; + PageResult pageResult = new PageResult(count, currentPage, (Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); + return RespBuilder.buildSuccess(pageResult); } }