From 837eae61536b94ddeca16059ba16122cd22e6f06 Mon Sep 17 00:00:00 2001 From: shiyang Date: Sat, 9 Oct 2021 15:18:02 +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=EF=BC=8C=E7=94=B7=E6=80=A7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ResidentsArchiveFacade.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 4ea4c41..660d1e2 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 @@ -980,7 +980,13 @@ public class ResidentsArchiveFacade { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); String hospital = autoMatchFacade.getHospitalId(userId); - archiveQuery.setSex(SystemConfig.WOMAN_ID); +// archiveQuery.setSex(SystemConfig.WOMAN_ID); + //隆化-妇女健康管理-妇女管理（区分男女模块1：男） + if (null!=queryRequest.getSex()) { + archiveQuery.setSex(SystemConfig.MAN_ID); + }else { + archiveQuery.setSex(SystemConfig.WOMAN_ID); + } archiveQuery.setHospitalId(hospital); archiveQuery.setProvinceId(queryRequest.getProvinceId()); archiveQuery.setCityId(queryRequest.getCityId()); @@ -993,7 +999,7 @@ public class ResidentsArchiveFacade { for (ResidentsArchiveModel data : archiveModelList) { Map map = new HashMap<>(); map.put("username", data.getUsername()); - map.put("sex", "女"); + map.put("sex", null!=queryRequest.getSex()?"男":"女"); map.put("birthday", FunvCommonUtil.getBirthday(DateUtil.getyyyy_MM_dd(data.getBirthday()))); map.put("countryId", FunvCommonUtil.getBaseicConfigByid(data.getCountryId(), basicConfigService)); map.put("nationId", FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService)); -- 1.8.3.1