diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 11b3eef..c93a82b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2728,7 +2728,7 @@ public class AntenatalExaminationFacade { AntExChuQuery antExChuQuery = new AntExChuQuery(); //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { antExChuQuery.setParentId(patients.getId()); } @@ -2757,7 +2757,7 @@ public class AntenatalExaminationFacade { //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { antExQuery.setParentId(patients.getId()); } @@ -2784,7 +2784,7 @@ public class AntenatalExaminationFacade { //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())) + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { antExQuery1.setParentId(patients.getId()); }