Commit 013e387e7ad32283853f2251cfb5b01aa2838ab9
1 parent
c8f3637009
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java
View file @
013e387
| ... | ... | @@ -56,7 +56,8 @@ |
| 56 | 56 | "2".equals(babyOralCheck.getSq()) || "2".equals(babyOralCheck.getHgfyqk()) || "2".equals(babyOralCheck.getYyyqk()) || |
| 57 | 57 | "2".equals(babyOralCheck.getKqblxg()) || "2".equals(babyOralCheck.getYssqk()) || "2".equals(babyOralCheck.getYcwsqk()) || |
| 58 | 58 | "2".equals(babyOralCheck.getYcmhd()) || "2".equals(babyOralCheck.getKqnm()) || "2".equals(babyOralCheck.getCxd()) || |
| 59 | - "2".equals(babyOralCheck.getSb()) || "2".equals(babyOralCheck.getYhqk()) || "2".equals(babyOralCheck.getYcplqk()) | |
| 59 | + "2".equals(babyOralCheck.getSb()) || "2".equals(babyOralCheck.getYhqk()) || "2".equals(babyOralCheck.getYcplqk()) || | |
| 60 | + CollectionUtils.isNotEmpty(babyOralCheck.getOralHighRisk()) | |
| 60 | 61 | ){ |
| 61 | 62 | babyOralCheck.setPositiveType("2"); |
| 62 | 63 | }else { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
View file @
013e387
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | "2".equals(babyCheck.getLhhqsyLeft()) || "2".equals(babyCheck.getLhhqsyRight()) || "2".equals(babyCheck.getLhswxw()) || |
| 56 | 56 | "2".equals(babyCheck.getLhqgsc()) || "2".equals(babyCheck.getLhywjcLeft()) || "2".equals(babyCheck.getLjywjcRight()) || |
| 57 | 57 | "2".equals(babyCheck.getLhyqyd()) || "2".equals(babyCheck.getLhsylwwc()) || "2".equals(babyCheck.getLhsljcLeft()) || |
| 58 | - "2".equals(babyCheck.getLhsljcRight()) | |
| 58 | + "2".equals(babyCheck.getLhsljcRight()) || CollectionUtils.isNotEmpty(babyCheck.getEyeHighRisk()) | |
| 59 | 59 | ){ |
| 60 | 60 | babyCheck.setPositiveType("2"); |
| 61 | 61 | babyCheck.setChuPositiveType("2"); |