From efe3843a40aa5253d82cb1c7eb91c028e3a65ee5 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 20 Dec 2018 14:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=BD=95=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     | 30 +++++++++++++++++-----
 .../request/AntenatalExaminationQueryRequest.java  | 10 ++++++++
 2 files changed, 33 insertions(+), 7 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 8e87c87..7f949dc 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
@@ -2660,19 +2660,35 @@ public class AntenatalExaminationFacade {
 //                patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
         }
 
-        if (null == patients) {
-            if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
-                patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
+        if (StringUtils.isNotEmpty(queryRequest.getSupplement()))
+        {
+            if (null == patients) {
+                if (StringUtils.isNotEmpty(queryRequest.getCardNo()) || StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
+                    patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
+                }
+
+                if (null == patients) {
+                    return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("该孕妇在系统中没有档案，请新建档");
+                }
             }
+        }
+        else
+        {
+            if (null == patients) {
+                if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
+                    patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
+                }
 
-            //原来单机
-            if (null != patients) {
-                return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
+                //原来单机
+                if (null != patients) {
+                    return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
+                }
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
             }
-            return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
         }
 
 
+
         MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
 
         matDeliverQuery.setPid(patients.getPid());
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 fc8fccf..9e4a5b0 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
@@ -27,6 +27,16 @@ public class AntenatalExaminationQueryRequest {
 
     private String coupon;
 
+    private String supplement;
+
+    public String getSupplement() {
+        return supplement;
+    }
+
+    public void setSupplement(String supplement) {
+        this.supplement = supplement;
+    }
+
     public String getCoupon() {
         return coupon;
     }
-- 
1.8.3.1