Commit 837eae61536b94ddeca16059ba16122cd22e6f06
1 parent
dbc458f2fd
Exists in
master
and in
6 other branches
妇女管理，加入男性建档管理列表，男性列表打印
Showing 1 changed file with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
837eae6
| ... | ... | @@ -980,7 +980,13 @@ |
| 980 | 980 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
| 981 | 981 | archiveQuery.setYn(YnEnums.YES.getId()); |
| 982 | 982 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 983 | - archiveQuery.setSex(SystemConfig.WOMAN_ID); | |
| 983 | +// archiveQuery.setSex(SystemConfig.WOMAN_ID); | |
| 984 | + //隆化-妇女健康管理-妇女管理（区分男女模块1：男） | |
| 985 | + if (null!=queryRequest.getSex()) { | |
| 986 | + archiveQuery.setSex(SystemConfig.MAN_ID); | |
| 987 | + }else { | |
| 988 | + archiveQuery.setSex(SystemConfig.WOMAN_ID); | |
| 989 | + } | |
| 984 | 990 | archiveQuery.setHospitalId(hospital); |
| 985 | 991 | archiveQuery.setProvinceId(queryRequest.getProvinceId()); |
| 986 | 992 | archiveQuery.setCityId(queryRequest.getCityId()); |
| ... | ... | @@ -993,7 +999,7 @@ |
| 993 | 999 | for (ResidentsArchiveModel data : archiveModelList) { |
| 994 | 1000 | Map<String, Object> map = new HashMap<>(); |
| 995 | 1001 | map.put("username", data.getUsername()); |
| 996 | - map.put("sex", "女"); | |
| 1002 | + map.put("sex", null!=queryRequest.getSex()?"男":"女"); | |
| 997 | 1003 | map.put("birthday", FunvCommonUtil.getBirthday(DateUtil.getyyyy_MM_dd(data.getBirthday()))); |
| 998 | 1004 | map.put("countryId", FunvCommonUtil.getBaseicConfigByid(data.getCountryId(), basicConfigService)); |
| 999 | 1005 | map.put("nationId", FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService)); |