From 91029b84cb7d43cec4ae84e926529f8867a0ec78 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 20 Dec 2018 15:05:46 +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     | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 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 7f949dc..9346f6f 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
@@ -2709,23 +2709,34 @@ public class AntenatalExaminationFacade {
         Patients fmPatient = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
 
         List<SortIn> sortList = new ArrayList<>();
-        if (fmPatient != null) {
-            fmPatient.setBookbuildingDate(fmPatient.getFmDate());
-            sortList.add(new SortIn(fmPatient));
+
+        if (StringUtils.isNotEmpty(queryRequest.getSupplement()))
+        {
+            if (fmPatient != null) {
+                sortList.add(new SortIn(fmPatient,""));
+            }
         }
-        if (CollectionUtils.isNotEmpty(list1)) {
-            for (MaternalDeliverModel model : list1) {
-                sortList.add(new SortIn(model));
+        else
+        {
+            if (fmPatient != null) {
+                fmPatient.setBookbuildingDate(fmPatient.getFmDate());
+                sortList.add(new SortIn(fmPatient));
             }
+            if (CollectionUtils.isNotEmpty(list1)) {
+                for (MaternalDeliverModel model : list1) {
+                    sortList.add(new SortIn(model));
+                }
 
-        }
-        if (CollectionUtils.isNotEmpty(list2)) {
-            for (StopPregModel model : list2) {
-                sortList.add(new SortIn(model));
+            }
+            if (CollectionUtils.isNotEmpty(list2)) {
+                for (StopPregModel model : list2) {
+                    sortList.add(new SortIn(model));
+                }
             }
         }
 
 
+
         AntexListResult antexListResult = new AntexListResult();
         String pid = patients.getId();
 
-- 
1.8.3.1