Commit 7fbe97b2d5c6804673973269ad252c44e9241b0a
1 parent
eb54fd4635
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 16 additions and 3 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java
View file @
7fbe97b
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
7fbe97b
| ... | ... | @@ -784,6 +784,7 @@ |
| 784 | 784 | List<Map<String, Object>> restMap = new ArrayList<>(); |
| 785 | 785 | for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { |
| 786 | 786 | Map<String, Object> temp = new HashMap<>(); |
| 787 | + temp.put("edition", babyEyeCheck.getEdition()); | |
| 787 | 788 | temp.put("id", babyEyeCheck.getId()); |
| 788 | 789 | temp.put("babyId", babyEyeCheck.getBabyId()); |
| 789 | 790 | temp.put("pid", babyEyeCheck.getPid()); |
| ... | ... | @@ -807,7 +808,19 @@ |
| 807 | 808 | temp.put("birth", DateUtil.getYyyyMmDd(babyModel.getBirth())); |
| 808 | 809 | } |
| 809 | 810 | if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { |
| 810 | - temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; | |
| 811 | + if(StringUtils.isNotEmpty(babyEyeCheck.getEdition())){ | |
| 812 | + //处理老数据 | |
| 813 | + if("0".equals(babyEyeCheck.getCheckMonthId())){ | |
| 814 | + babyEyeCheck.setCheckMonthId("1"); | |
| 815 | + }else if("9".equals(babyEyeCheck.getCheckMonthId())){ | |
| 816 | + babyEyeCheck.setCheckMonthId("12"); | |
| 817 | + }else if("18".equals(babyEyeCheck.getCheckMonthId())){ | |
| 818 | + babyEyeCheck.setCheckMonthId("24"); | |
| 819 | + } | |
| 820 | + temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); | |
| 821 | + }else { | |
| 822 | + temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; | |
| 823 | + } | |
| 811 | 824 | } |
| 812 | 825 | |
| 813 | 826 | StringBuilder positive = new StringBuilder(); /** 阳性项目 */ |