From b75167d4146f4e33a1defc7b3e7e989fc23c4766 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 4 Sep 2018 14:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=9A=E4=BA=A7=E7=A8=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntenatalExaminationFacade.java    | 15 ++++++++++++---
 .../web/request/AntenatalExaminationQueryRequest.java     | 10 ++++++++++
 2 files changed, 22 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 2f9c2e7..b93e964 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
@@ -2746,6 +2746,10 @@ public class AntenatalExaminationFacade {
         {
             antExChuQuery.setParentId(patients.getId());
         }
+        else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
+        {
+            antExChuQuery.setParentId(patients.getId());
+        }
         else
         {
             antExChuQuery.setPid(patients.getPid());
@@ -2760,7 +2764,6 @@ public class AntenatalExaminationFacade {
         }
         antExChuQuery.setStart(max);
 
-        // System.out.println("初诊查询："+antExChuQuery.convertToQuery().convertToMongoQuery());
         //获取初诊记录
         List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
 
@@ -2775,6 +2778,10 @@ public class AntenatalExaminationFacade {
         {
             antExQuery.setParentId(patients.getId());
         }
+        else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
+        {
+            antExQuery.setParentId(patients.getId());
+        }
         else
         {
             antExQuery.setPid(patients.getPid());
@@ -2797,11 +2804,14 @@ public class AntenatalExaminationFacade {
         antExQuery1.setHospitalId(hospitalId);
 
         //http://jira.healthbaby.com.cn/browse/WEB-2733
-
         if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
         {
             antExQuery1.setParentId(patients.getId());
         }
+        else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
+        {
+            antExQuery1.setParentId(patients.getId());
+        }
         else
         {
             antExQuery1.setPid(patients.getPid());
@@ -2810,7 +2820,6 @@ public class AntenatalExaminationFacade {
 
         antExQuery1.setYn(YnEnums.YES.getId());
         antExQuery1.setStart(max);
-        // System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery());
         List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
 
         String lastTime = "";
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java
index 6081a97..fc8fccf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java
@@ -25,6 +25,16 @@ public class AntenatalExaminationQueryRequest {
 
     private String barCode;
 
+    private String coupon;
+
+    public String getCoupon() {
+        return coupon;
+    }
+
+    public void setCoupon(String coupon) {
+        this.coupon = coupon;
+    }
+
     public String getBarCode() {
         return barCode;
     }
-- 
1.8.3.1