From bec198af2284ab6febcf7ffa1cd42a1f9465ec3e Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Fri, 8 Oct 2021 15:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=94=B7=E6=80=A7=E5=BB=BA=E6=A1=A3=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ResidentsArchiveFacade.java         |  9 ++++++++-
 .../operate/web/request/ResidentsArchiveQueryRequest.java  | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index 14e484a..4ea4c41 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -877,7 +877,14 @@ public class ResidentsArchiveFacade {
         }
 
         //只查询女性
-        query.setSex(SystemConfig.WOMAN_ID);
+//        query.setSex(SystemConfig.WOMAN_ID);
+
+        //隆化-妇女健康管理-妇女管理（区分男女模块1：男）
+        if (null!=queryRequest.getSex()) {
+            query.setSex(SystemConfig.MAN_ID);
+        }else {
+            query.setSex(SystemConfig.WOMAN_ID);
+        }
 
         query.setProvinceId(queryRequest.getProvinceId());
         query.setCityId(queryRequest.getCityId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
index 4357216..51eb789 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
@@ -56,6 +56,20 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{
     //建档时间
     private String buildDate;
 
+    //隆化-妇女健康管理-妇女管理（区分男女模块1：男）
+    private Integer sex;
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public ResidentsArchiveQueryRequest() {
+    }
+
     public String getBuildDate() {
         return buildDate;
     }
-- 
1.8.3.1