Commit 05f5c9a42d52d2d1c38141c3d5e3d40264a7e9cd
1 parent
7fbe97b2d5
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 13 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
05f5c9a
... | ... | @@ -1012,17 +1012,21 @@ |
1012 | 1012 | Map<String, Object> temp = new HashMap<>(); |
1013 | 1013 | temp.put("id", babyEyeCheck.getId()); |
1014 | 1014 | temp.put("hospitalId", babyEyeCheck.getHospitalId()); |
1015 | + temp.put("edition", babyEyeCheck.getEdition()); | |
1015 | 1016 | temp.put("pid", babyEyeCheck.getPid()); |
1016 | - | |
1017 | - //处理老数据 | |
1018 | - if("0".equals(babyEyeCheck.getCheckMonthId())){ | |
1019 | - babyEyeCheck.setCheckMonthId("1"); | |
1020 | - }else if("9".equals(babyEyeCheck.getCheckMonthId())){ | |
1021 | - babyEyeCheck.setCheckMonthId("12"); | |
1022 | - }else if("18".equals(babyEyeCheck.getCheckMonthId())){ | |
1023 | - babyEyeCheck.setCheckMonthId("24"); | |
1017 | + if(StringUtils.isNotEmpty(babyEyeCheck.getEdition())){ | |
1018 | + //处理老数据 | |
1019 | + if("0".equals(babyEyeCheck.getCheckMonthId())){ | |
1020 | + babyEyeCheck.setCheckMonthId("1"); | |
1021 | + }else if("9".equals(babyEyeCheck.getCheckMonthId())){ | |
1022 | + babyEyeCheck.setCheckMonthId("12"); | |
1023 | + }else if("18".equals(babyEyeCheck.getCheckMonthId())){ | |
1024 | + babyEyeCheck.setCheckMonthId("24"); | |
1025 | + } | |
1026 | + temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); | |
1027 | + }else { | |
1028 | + temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); | |
1024 | 1029 | } |
1025 | - temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); | |
1026 | 1030 | BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); |
1027 | 1031 | if (babyModel != null) { |
1028 | 1032 | temp.put("name", babyModel.getName()); |