Commit 7380c8e5985c6f5d97c2567e79238638526f34be
1 parent
0e3a955437
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 14 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
7380c8e
| ... | ... | @@ -696,6 +696,7 @@ |
| 696 | 696 | Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, |
| 697 | 697 | Integer page, Integer limit, Date bookStartDate, Date bookEndDate, |
| 698 | 698 | String apparatusPositive, String doctorPositive, String yin) { |
| 699 | + boolean b = true; | |
| 699 | 700 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 700 | 701 | Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); |
| 701 | 702 | if (startDate != null && endDate != null) { |
| 702 | 703 | |
| ... | ... | @@ -707,9 +708,20 @@ |
| 707 | 708 | if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { |
| 708 | 709 | criteria.and("doctor").is(doctor); |
| 709 | 710 | } |
| 711 | + | |
| 712 | + if(b && StringUtils.isNotEmpty(chechMonth)){ | |
| 713 | + if("0".equals(chechMonth)){ | |
| 714 | + chechMonth = "1"; | |
| 715 | + }else if("9".equals(chechMonth)){ | |
| 716 | + chechMonth = "12"; | |
| 717 | + }else if("18".equals(chechMonth)){ | |
| 718 | + chechMonth = "24"; | |
| 719 | + } | |
| 720 | + } | |
| 710 | 721 | if (StringUtils.isNotEmpty(chechMonth)) { |
| 711 | 722 | criteria.and("checkMonthId").is(chechMonth); |
| 712 | 723 | } |
| 724 | + | |
| 713 | 725 | if (currentMonthStart != null && currentMonthEnd != null) { |
| 714 | 726 | Date start = DateUtil.getBirthStart(currentMonthEnd); |
| 715 | 727 | Date end = DateUtil.getBirthEnd(currentMonthStart); |
| ... | ... | @@ -1047,6 +1059,7 @@ |
| 1047 | 1059 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 1048 | 1060 | List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** 检查月龄 */ |
| 1049 | 1061 | List<Map<String, Object>> currentMonth = EnumUtil.toJson(CheckMonthEnums2.class); /** 检查月龄 */ |
| 1062 | + List<Map<String, Object>> checkMonthQhdEnums = EnumUtil.toJson(CheckMonthQhdEnums.class); /** (检查时间 */ | |
| 1050 | 1063 | List<Map<String, Object>> positive = new ArrayList<>(); /** 阳性项目 */ |
| 1051 | 1064 | |
| 1052 | 1065 | if ("197".equals(hospitalId)) { |
| ... | ... | @@ -1232,7 +1245,7 @@ |
| 1232 | 1245 | } |
| 1233 | 1246 | |
| 1234 | 1247 | |
| 1235 | - return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth); | |
| 1248 | + return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums); | |
| 1236 | 1249 | } |
| 1237 | 1250 | |
| 1238 | 1251 | @Override |