Commit ed249e4ccb12780fddf52f74bbe2d1064c3e04e2
1 parent
14a951ed17
Exists in
master
and in
6 other branches
年报bug修改
Showing 2 changed files with 12 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
View file @
ed249e4
| ... | ... | @@ -103,8 +103,6 @@ |
| 103 | 103 | |
| 104 | 104 | |
| 105 | 105 | List<Map<String, String>> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate); |
| 106 | - | |
| 107 | - System.out.println(mapList); | |
| 108 | 106 | this.sum(mapList); |
| 109 | 107 | httpServletResponse.setContentType("application/force-download"); |
| 110 | 108 | httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1")); |
| ... | ... | @@ -350,7 +348,6 @@ |
| 350 | 348 | //机构名称 |
| 351 | 349 | BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class); |
| 352 | 350 | map.put("orgName", basicConfig.getName()); |
| 353 | - | |
| 354 | 351 | //活产数 |
| 355 | 352 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 356 | 353 | babyModelQuery.setDataStatus(false); |
| ... | ... | @@ -499,8 +496,7 @@ |
| 499 | 496 | int j = 0; |
| 500 | 497 | for (AntExChuModel antExChu : antExChuModels) { |
| 501 | 498 | if (StringUtils.isNotEmpty(antExChu.getXhdb())) { |
| 502 | - System.out.println(antExChu.getXhdb()); | |
| 503 | - if (Integer.valueOf(antExChu.getXhdb()).intValue() > 100) { | |
| 499 | + if (Double.valueOf(antExChu.getXhdb()).doubleValue() > 100.0) { | |
| 504 | 500 | ++j; |
| 505 | 501 | } |
| 506 | 502 | } |
| ... | ... | @@ -535,7 +531,7 @@ |
| 535 | 531 | int hiv = antenatalExaminationService.queryAntExChuCount(antExChuQuery.convertToQuery()); |
| 536 | 532 | map.put("hivYang", String.valueOf(hiv)); |
| 537 | 533 | //感染人数的10万分之1 |
| 538 | - map.put("hivYangPervent", String.valueOf((double) hiv != 0.0 ? hiv / 100000 : 0)); | |
| 534 | + map.put("hivYangPervent", String.valueOf(hiv)); | |
| 539 | 535 | //产妇梅毒检测人数 |
| 540 | 536 | |
| 541 | 537 | AntExChuQuery veroleChuQuery1 = new AntExChuQuery(); |
| 542 | 538 | |
| ... | ... | @@ -548,11 +544,8 @@ |
| 548 | 544 | veroleChuQuery1.setSyjgList(hivList); |
| 549 | 545 | int veroleCount = antenatalExaminationService.queryAntExChuCount(veroleChuQuery1.convertToQuery()); |
| 550 | 546 | map.put("veroleCount", String.valueOf(veroleCount)); |
| 551 | - | |
| 552 | - | |
| 553 | 547 | map.put("verolePervent", this.division(veroleCount, chanCount)); |
| 554 | 548 | |
| 555 | - // | |
| 556 | 549 | AntExChuQuery veroleChuQuery = new AntExChuQuery(); |
| 557 | 550 | veroleChuQuery.setYn(1); |
| 558 | 551 | if (StringUtils.isNotEmpty(time)) { |
| ... | ... | @@ -711,8 +704,7 @@ |
| 711 | 704 | matDeliverKillQuery.setMaternalInfo("2"); |
| 712 | 705 | int killCount = matDeliverService.count(matDeliverKillQuery); |
| 713 | 706 | map.put("killCount", String.valueOf(killCount)); |
| 714 | - Double s = (double) killCount != 0.0 ? (double) killCount / 100000 : 0; | |
| 715 | - map.put("killPervent", String.valueOf(s)); | |
| 707 | + map.put("killPervent", String.valueOf(killCount)); | |
| 716 | 708 | |
| 717 | 709 | //产科出血人数 |
| 718 | 710 | MatDeliverQuery matDeliverKillQuery1 = new MatDeliverQuery(); |
| ... | ... | @@ -865,6 +857,7 @@ |
| 865 | 857 | List<String> PregnancyOuts = new ArrayList<>(); |
| 866 | 858 | PregnancyOuts.add("1"); |
| 867 | 859 | PregnancyOuts.add("3"); |
| 860 | + PregnancyOuts.add("2"); | |
| 868 | 861 | |
| 869 | 862 | matDeliverQuery10.setPregnancyOuts(PregnancyOuts); |
| 870 | 863 | matDeliverQuery10.setFmHospitalList(entry.getValue()); |
| 871 | 864 | |
| ... | ... | @@ -923,12 +916,10 @@ |
| 923 | 916 | } |
| 924 | 917 | |
| 925 | 918 | public static void main(String[] args) { |
| 926 | - double s = 12; | |
| 919 | + double s = 12.23; | |
| 927 | 920 | double d; |
| 928 | - if (s != 0.0) { | |
| 929 | - d = s / 10000; | |
| 930 | - System.out.println(d); | |
| 931 | - } | |
| 921 | + Integer s1 = (int) s; | |
| 922 | + System.out.println(s1); | |
| 932 | 923 | |
| 933 | 924 | } |
| 934 | 925 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
View file @
ed249e4
| ... | ... | @@ -152,7 +152,11 @@ |
| 152 | 152 | keys.add(patients1.getId()); |
| 153 | 153 | } |
| 154 | 154 | } else { |
| 155 | - return RespBuilder.buildSuccess(null); | |
| 155 | + List<Map<String, Object>> couponInfos = new ArrayList<>(); | |
| 156 | + String subTitle = null; | |
| 157 | + int count = 0; | |
| 158 | + PageResult pageResult = new PageResult(count, currentPage, (Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); | |
| 159 | + return RespBuilder.buildSuccess(pageResult); | |
| 156 | 160 | } |
| 157 | 161 | |
| 158 | 162 | } |