From 2af9e10e30654659fb0bf88e8591ec3a6528669d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 14 Jun 2018 15:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=AF=8D=E4=BA=B2=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntExRecordFacade.java      | 25 ++++++++++++++++++----
 .../web/request/BabyBookbuildingAddRequest.java    |  3 ---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index fd3b5ce..f128b8e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -593,12 +593,29 @@ public class AntExRecordFacade {
         }
 
         antExRecordQuery.setHospitalId(hospitalId);
+
+        PatientsQuery patientsQuery = new PatientsQuery();
+        if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
+            patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
+            patientsQuery.setHospitalId(hospitalId);
+            List<Patients> patientses = patientsService.queryPatient(patientsQuery);
+
+            if (CollectionUtils.isNotEmpty(patientses)) {
+                List<String> parentIds = new LinkedList<>();
+                for (Patients pa : patientses) {
+                    parentIds.add(pa.getId());
+                }
+                antExRecordQuery.setParentIds(parentIds);
+            }
+        }
+
+
         List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created");
         Map<String,List<AntExRecordModel>> map = handleAntexRecord(antExRecordModelList);
         AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery();
 
         //查询产检新增的高危分页记录
-        List<AntExRecordModel>  pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest.getPage(),antExManagerQueryRequest.getLimit());
+        List<AntExRecordModel>  pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest);
 
         //查询产检详情
         List<AntExManagerResult>  data = getAntExRecords(pageAntExRecords, hospitalId, false, antExManagerQueryRequest.getShowDetail());
@@ -607,7 +624,7 @@ public class AntExRecordFacade {
     }
 
 
-    private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,Integer page,Integer limit)
+    private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,AntExManagerQueryRequest request)
     {
         List<String> riskListIds = new ArrayList<>();
         Map<String,List<String>> incriskMap = new HashMap<>();
@@ -706,8 +723,8 @@ public class AntExRecordFacade {
             }
         }
         pageAntExRecordsQuery.setNeed("true");
-        pageAntExRecordsQuery.setPage(page);
-        pageAntExRecordsQuery.setLimit(limit);
+        pageAntExRecordsQuery.setPage(request.getPage());
+        pageAntExRecordsQuery.setLimit(request.getLimit());
         pageAntExRecordsQuery.setIds(riskListIds);
         List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery);
         if (CollectionUtils.isNotEmpty(pageAntExRecords))
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
index 16d72b8..050ebb0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
@@ -60,9 +60,6 @@ public class BabyBookbuildingAddRequest {
 	//建档Id
 	private String id;
 
-	//母亲名称
-	@FormParam
-	@NotEmpty(message = "母亲名称不能为空")
 	private String mommyName;
 
 	//证件号号
-- 
1.8.3.1