Commit 0c7e75479f90de8b099048961b971d149a8f181d
1 parent
e8b5c3f41c
Exists in
master
and in
1 other branch
高危匹配
Showing 1 changed file with 9 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
0c7e754
| ... | ... | @@ -3701,24 +3701,27 @@ |
| 3701 | 3701 | //浮肿 |
| 3702 | 3702 | for (DiagnoseItemModel item : items) { |
| 3703 | 3703 | if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) |
| 3704 | - && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) && | |
| 3705 | - CollectionUtils.isNotEmpty(item.getRiskIds())) { | |
| 3704 | + && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) | |
| 3705 | + && FuZhongEnums.O.getId().equals(antExcAddRequest.getEdema()) | |
| 3706 | + && CollectionUtils.isNotEmpty(item.getRiskIds())) { | |
| 3706 | 3707 | list.addAll(item.getRiskIds()); |
| 3707 | 3708 | } |
| 3708 | 3709 | else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) |
| 3709 | - && String.valueOf(DiagnoseEnums.JwsChildEnums.B.getId()).equals(item.getValueTwo()) && | |
| 3710 | - CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3710 | + && String.valueOf(DiagnoseEnums.JwsChildEnums.B.getId()).equals(item.getValueTwo()) | |
| 3711 | + && FuZhongEnums.O1.getId().equals(antExcAddRequest.getEdema()) && CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3711 | 3712 | { |
| 3712 | 3713 | list.addAll(item.getRiskIds()); |
| 3713 | 3714 | } |
| 3714 | 3715 | else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) |
| 3715 | - && String.valueOf(DiagnoseEnums.JwsChildEnums.C.getId()).equals(item.getValueTwo()) && | |
| 3716 | + && String.valueOf(DiagnoseEnums.JwsChildEnums.C.getId()).equals(item.getValueTwo()) | |
| 3717 | + && FuZhongEnums.O2.getId().equals(antExcAddRequest.getEdema()) && | |
| 3716 | 3718 | CollectionUtils.isNotEmpty(item.getRiskIds())) |
| 3717 | 3719 | { |
| 3718 | 3720 | list.addAll(item.getRiskIds()); |
| 3719 | 3721 | } |
| 3720 | 3722 | else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) |
| 3721 | - && String.valueOf(DiagnoseEnums.JwsChildEnums.D.getId()).equals(item.getValueTwo()) && | |
| 3723 | + && String.valueOf(DiagnoseEnums.JwsChildEnums.D.getId()).equals(item.getValueTwo()) | |
| 3724 | + && FuZhongEnums.O3.getId().equals(antExcAddRequest.getEdema()) && | |
| 3722 | 3725 | CollectionUtils.isNotEmpty(item.getRiskIds())) |
| 3723 | 3726 | { |
| 3724 | 3727 | list.addAll(item.getRiskIds()); |