Commit 2cbb31d75f7ff03c62d84f88822f8294ff55ce03
1 parent
a7d320a638
Exists in
master
and in
6 other branches
产检
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
2cbb31d
| ... | ... | @@ -2728,7 +2728,7 @@ |
| 2728 | 2728 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 2729 | 2729 | |
| 2730 | 2730 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2731 | - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2731 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) | |
| 2732 | 2732 | { |
| 2733 | 2733 | antExChuQuery.setParentId(patients.getId()); |
| 2734 | 2734 | } |
| ... | ... | @@ -2757,7 +2757,7 @@ |
| 2757 | 2757 | |
| 2758 | 2758 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2759 | 2759 | |
| 2760 | - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2760 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) | |
| 2761 | 2761 | { |
| 2762 | 2762 | antExQuery.setParentId(patients.getId()); |
| 2763 | 2763 | } |
| ... | ... | @@ -2784,7 +2784,7 @@ |
| 2784 | 2784 | |
| 2785 | 2785 | //http://jira.healthbaby.com.cn/browse/WEB-2733 |
| 2786 | 2786 | |
| 2787 | - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) | |
| 2787 | + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) | |
| 2788 | 2788 | { |
| 2789 | 2789 | antExQuery1.setParentId(patients.getId()); |
| 2790 | 2790 | } |