From a7d320a638c97cbd80b13fc57726e85b1946710c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 6 Aug 2018 14:36:14 +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

---
 .../web/facade/AntenatalExaminationFacade.java     | 60 ++++++++++++----------
 1 file changed, 32 insertions(+), 28 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 a1a193d..11b3eef 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
@@ -2502,32 +2502,12 @@ public class AntenatalExaminationFacade {
         }
 
         if (StringUtils.isNotEmpty(vcCardNo)) {
-
-            PatientsQuery pquery = new PatientsQuery();
-
             //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy
             if ("1000000114".equals(hospitalIds)) {
-                pquery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
+                patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
             } else {
-                pquery.setVcCardNo(vcCardNo);
-            }
-
-            pquery.setHospitalList(hospitalIds);
-            pquery.setYn(YnEnums.YES.getId());
-            pquery.setBuildType(1);
-            if (isEnable) {
-                pquery.setEnable("2");
-            }
-
-            List<Patients> list = patientsService.queryPatient1(pquery,"created");
-            if (CollectionUtils.isNotEmpty(list)) {
-                patientsQuery.setCardNo(list.get(0).getCardNo());
-            }
-            else
-            {
-                return null;
+                patientsQuery.setVcCardNo(vcCardNo);
             }
-
         }
 
         patientsQuery.setType(type);
@@ -2748,8 +2728,16 @@ public class AntenatalExaminationFacade {
         AntExChuQuery antExChuQuery = new AntExChuQuery();
 
         //http://jira.healthbaby.com.cn/browse/WEB-2733
-        antExChuQuery.setPid(patients.getPid());
-        //antExChuQuery.setParentId(patients.getId());
+        if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()))
+        {
+            antExChuQuery.setParentId(patients.getId());
+        }
+        else
+        {
+            antExChuQuery.setPid(patients.getPid());
+        }
+
+
         antExChuQuery.setYn(YnEnums.YES.getId());
         Date max = null;
         if (!sortList.isEmpty()) {
@@ -2768,8 +2756,16 @@ public class AntenatalExaminationFacade {
         antExQuery.setYn(YnEnums.YES.getId());
 
         //http://jira.healthbaby.com.cn/browse/WEB-2733
-        antExQuery.setPid(patients.getPid());
-        //antExQuery.setParentId(patients.getId());
+
+        if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()))
+        {
+            antExQuery.setParentId(patients.getId());
+        }
+        else
+        {
+            antExQuery.setPid(patients.getPid());
+        }
+
 
 
         antExQuery.setStart(max);
@@ -2787,8 +2783,16 @@ public class AntenatalExaminationFacade {
         antExQuery1.setHospitalId(hospitalId);
 
         //http://jira.healthbaby.com.cn/browse/WEB-2733
-        antExQuery1.setPid(patients.getPid());
-        //antExQuery1.setParentId(patients.getId());
+
+        if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()))
+        {
+            antExQuery1.setParentId(patients.getId());
+        }
+        else
+        {
+            antExQuery1.setPid(patients.getPid());
+        }
+
 
         antExQuery1.setYn(YnEnums.YES.getId());
         antExQuery1.setStart(max);
-- 
1.8.3.1