Commit c8b0794d14d4de95a27c4312c39e4d8c26f7ee36
1 parent
7f03e4de06
Exists in
master
and in
6 other branches
产检
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
c8b0794
| ... | ... | @@ -3507,7 +3507,7 @@ |
| 3507 | 3507 | patientsQuery.setPid(pid); |
| 3508 | 3508 | } |
| 3509 | 3509 | |
| 3510 | - if (StringUtils.isNotEmpty(cardNo)) { | |
| 3510 | + if (StringUtils.isEmpty(cardNo)) { | |
| 3511 | 3511 | if (StringUtils.isNotEmpty(vcCardNo)) { |
| 3512 | 3512 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 3513 | 3513 | if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { |
| ... | ... | @@ -3561,7 +3561,7 @@ |
| 3561 | 3561 | patientsQuery.setCardNo(cardNo); |
| 3562 | 3562 | } |
| 3563 | 3563 | |
| 3564 | - if (StringUtils.isNotEmpty(vcCardNo)) { | |
| 3564 | + if (StringUtils.isNotEmpty(vcCardNo) && StringUtils.isEmpty(cardNo)) { | |
| 3565 | 3565 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 3566 | 3566 | if ("1000000114".equals(hospitalId)) { |
| 3567 | 3567 | patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); |