From 2cbb31d75f7ff03c62d84f88822f8294ff55ce03 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 6 Aug 2018 14:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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()); } -- 1.8.3.1