From 00f773d34bc4646148ffdfc0006bb31b38796d6c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 29 Sep 2021 11:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=86=E5=8C=96=E5=A9=9A?=
 =?UTF-8?q?=E6=A3=80=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/common/utils/AddressUtil.java    |  2 +-
 .../web/facade/PremaritalCheckupFacade.java        | 46 ++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
index 5e3923e..9cc25bf 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
@@ -47,7 +47,7 @@ public class AddressUtil {
     }
 
     public static void main(String[] ages) {
-        List<String> addrs = AddressUtil.getAddress("山东省威海市荣成市曙光东区26号207");
+        List<String> addrs = AddressUtil.getAddress("辽宁省建平县国营八家农场XX村2-040");
         for (String ad : addrs) {
             System.out.println(ad);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index f8be352..4534536 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -1153,11 +1153,42 @@ public class PremaritalCheckupFacade {
         List<Map<String, Object>> list = new ArrayList<>();
         String hospital = autoMatchFacade.getHospitalId(userId);
         try {
+
+            List<String> parentIds = null;
+
+            //用姓名和联系方式查询到的居民建档ID
+            if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())
+                    || StringUtils.isNotEmpty(request.getQueryNo()) || StringUtils.isNotEmpty(request.getZyzlState())
+                    || StringUtils.isNotEmpty(request.getZywzzlState()) || StringUtils.isNotEmpty(request.getGyState())) {
+                ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
+                archiveQuery.setQueryNo(request.getQueryNo());
+                archiveQuery.setYn(YnEnums.YES.getId());
+                archiveQuery.setUsername(request.getUsername());
+                archiveQuery.setCertificateNum(request.getCardNo());
+                archiveQuery.setPhone(request.getPhone());
+                archiveQuery.setHospitalId(request.getHospitalId());
+
+                List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
+                parentIds = new ArrayList<>();
+                if (CollectionUtils.isNotEmpty(modelList)) {
+                    for (ResidentsArchiveModel model : modelList) {
+                        parentIds.add(model.getId());
+                    }
+                } else {
+                    parentIds.add("-1");
+                }
+            }
             PremaritalCheckupQuery query = new PremaritalCheckupQuery();
-            query.setPage(request.getPage());
-            query.setLimit(request.getLimit());
-            query.setNeed("y");
             query.setYn(YnEnums.YES.getId());
+            query.setZyzlState(request.getZyzlState());
+            query.setZywzzlState(request.getZywzzlState());
+            query.setGyState(request.getGyState());
+
+            if (StringUtils.isNotEmpty(hospital)) {
+                query.setHospitalId(hospital);
+            } else {
+                query.setHospitalId("-1");
+            }
             query.setYiXueYiJian(request.getYiXueYiJian());
             if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) {
                 String[] dates = request.getPremaritalUpTime().split(" - ");
@@ -1171,7 +1202,14 @@ public class PremaritalCheckupFacade {
                     query.setPremaritalUpTimeEnd(date);
                 }
             }
-            query.setHospitalId(hospital);
+            query.setSexType(request.getSexType());
+
+            if (parentIds != null) {
+                query.setParentIds(parentIds);
+            }
+            System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery());
+
+
             List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
             if (CollectionUtils.isNotEmpty(data)) {
                 lhxfyExport(out, list, data, response);
-- 
1.8.3.1