Commit db166a83926826bff8d6f5c4c7e316590854a42d
1 parent
61fdf3ca5a
Exists in
master
and in
6 other branches
儿童检查列表bug修改
Showing 2 changed files with 22 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
db166a8
| ... | ... | @@ -157,11 +157,11 @@ |
| 157 | 157 | public BaseResponse list( |
| 158 | 158 | @RequestParam(value = "checkTime", required = false) String checkTime, |
| 159 | 159 | @RequestParam(value = "queryNo", required = false) String queryNo, |
| 160 | - @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge, | |
| 161 | - @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge, | |
| 160 | + @RequestParam(value = "startMonthAge", required = false) Integer startCheckMonthAge, | |
| 161 | + @RequestParam(value = "endMonthAge", required = false) Integer endCheckMonthAge, | |
| 162 | 162 | @RequestParam(value = "nextDate", required = false) String nextDate, |
| 163 | - @RequestParam(value = "highRisk", required = false) String highRisk, | |
| 164 | - @RequestParam(value = "waskSon", required = false) String waskSon, | |
| 163 | + @RequestParam(value = "highRisk", required = false) Integer highRisk, | |
| 164 | + @RequestParam(value = "waskSon", required = false) Integer waskSon, | |
| 165 | 165 | Integer page, Integer limit, HttpServletRequest request) { |
| 166 | 166 | return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request)); |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
| ... | ... | @@ -178,17 +178,17 @@ |
| 178 | 178 | public BaseResponse lists( |
| 179 | 179 | @RequestParam(value = "checkTime", required = false) String checkTime, |
| 180 | 180 | @RequestParam(value = "queryNo", required = false) String queryNo, |
| 181 | - @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge, | |
| 182 | - @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge, | |
| 181 | + @RequestParam(value = "startMonthAge", required = false) Integer startCheckMonthAge, | |
| 182 | + @RequestParam(value = "endMonthAge", required = false) Integer endCheckMonthAge, | |
| 183 | 183 | @RequestParam(value = "nextDate", required = false) String nextDate, |
| 184 | 184 | @RequestParam(value = "highRisk", required = false) String highRisk, |
| 185 | 185 | @RequestParam(value = "waskSon", required = false) String waskSon, |
| 186 | 186 | @RequestParam(value = "hospitalId", required = false) String hospitalId, |
| 187 | - @RequestParam(required = false) String proviceId, | |
| 188 | - @RequestParam(required = false) String cityId, | |
| 189 | - @RequestParam(required = false) String areaId, | |
| 187 | + @RequestParam(value = "proviceId", required = false) String proviceId, | |
| 188 | + @RequestParam(value = "cityId", required = false) String cityId, | |
| 189 | + @RequestParam(value = "areaId", required = false) String areaId, | |
| 190 | 190 | Integer page, Integer limit, HttpServletRequest request) { |
| 191 | - return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request),proviceId,cityId,areaId); | |
| 191 | + return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request), proviceId, cityId, areaId); | |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
db166a8
| ... | ... | @@ -755,7 +755,7 @@ |
| 755 | 755 | return br; |
| 756 | 756 | } |
| 757 | 757 | |
| 758 | - public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, String highRisk, String waskSon, Integer page, Integer limit, Integer userId) { | |
| 758 | + public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) { | |
| 759 | 759 | boolean flag = false; |
| 760 | 760 | List<String> hospital = groupsFacade.findGroupHospital(userId, false); |
| 761 | 761 | Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); |
| 762 | 762 | |
| 763 | 763 | |
| ... | ... | @@ -791,11 +791,12 @@ |
| 791 | 791 | } catch (Exception e) { |
| 792 | 792 | } |
| 793 | 793 | } |
| 794 | - if (StringUtils.isNotEmpty(highRisk)) { | |
| 794 | + if (null != highRisk) { | |
| 795 | 795 | criteria.and("highRisk").is(highRisk); |
| 796 | + System.out.println(highRisk); | |
| 796 | 797 | } |
| 797 | - if (StringUtils.isNotEmpty(waskSon)) { | |
| 798 | - criteria.and("waskSon").and(waskSon); | |
| 798 | + if (null != waskSon) { | |
| 799 | + criteria.and("waskSon").is(waskSon); | |
| 799 | 800 | } |
| 800 | 801 | PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); |
| 801 | 802 | List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid(); |
| ... | ... | @@ -808,7 +809,7 @@ |
| 808 | 809 | map.put("babyName", babyModel.getName()); |
| 809 | 810 | map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); |
| 810 | 811 | map.put("mName", babyModel.getMname()); |
| 811 | - map.put("mCardNo", babyModel.getCardNo()); | |
| 812 | + map.put("mCardNo", babyModel.getMcertNo()); | |
| 812 | 813 | map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 813 | 814 | map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 814 | 815 | } |
| ... | ... | @@ -848,7 +849,8 @@ |
| 848 | 849 | * 区域查询 |
| 849 | 850 | */ |
| 850 | 851 | public BaseResponse babyRegionCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, |
| 851 | - String nextDate, String highRisk, String waskSon, Integer page, Integer limit, String hospitalId, Integer userId, String proviceId, String cityId, String areaId) { | |
| 852 | + String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, | |
| 853 | + String hospitalId, Integer userId, String proviceId, String cityId, String areaId) { | |
| 852 | 854 | boolean flag = false; |
| 853 | 855 | List<String> hospitalIds = new ArrayList<>(); |
| 854 | 856 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospitalId)) { |
| 855 | 857 | |
| ... | ... | @@ -891,11 +893,11 @@ |
| 891 | 893 | } catch (Exception e) { |
| 892 | 894 | } |
| 893 | 895 | } |
| 894 | - if (StringUtils.isNotEmpty(highRisk)) { | |
| 896 | + if (null != highRisk) { | |
| 895 | 897 | criteria.and("highRisk").is(highRisk); |
| 896 | 898 | } |
| 897 | - if (StringUtils.isNotEmpty(waskSon)) { | |
| 898 | - criteria.and("waskSon").and(waskSon); | |
| 899 | + if (null != waskSon) { | |
| 900 | + criteria.and("waskSon").is(waskSon); | |
| 899 | 901 | } |
| 900 | 902 | PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); |
| 901 | 903 | List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid(); |
| ... | ... | @@ -908,7 +910,7 @@ |
| 908 | 910 | map.put("babyName", babyModel.getName()); |
| 909 | 911 | map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); |
| 910 | 912 | map.put("mName", babyModel.getMname()); |
| 911 | - map.put("mCardNo", babyModel.getCardNo()); | |
| 913 | + map.put("mCardNo", babyModel.getMcertNo()); | |
| 912 | 914 | map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 913 | 915 | map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); |
| 914 | 916 | } |