Commit 00f773d34bc4646148ffdfc0006bb31b38796d6c
1 parent
ad3b293ffd
Exists in
master
and in
6 other branches
修改隆化婚检导出
Showing 2 changed files with 43 additions and 5 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java
View file @
00f773d
| ... | ... | @@ -47,7 +47,7 @@ |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | public static void main(String[] ages) { |
| 50 | - List<String> addrs = AddressUtil.getAddress("山东省威海市荣成市曙光东区26号207"); | |
| 50 | + List<String> addrs = AddressUtil.getAddress("辽宁省建平县国营八家农场XX村2-040"); | |
| 51 | 51 | for (String ad : addrs) { |
| 52 | 52 | System.out.println(ad); |
| 53 | 53 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
00f773d
| ... | ... | @@ -1153,11 +1153,42 @@ |
| 1153 | 1153 | List<Map<String, Object>> list = new ArrayList<>(); |
| 1154 | 1154 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 1155 | 1155 | try { |
| 1156 | + | |
| 1157 | + List<String> parentIds = null; | |
| 1158 | + | |
| 1159 | + //用姓名和联系方式查询到的居民建档ID | |
| 1160 | + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo()) | |
| 1161 | + || StringUtils.isNotEmpty(request.getQueryNo()) || StringUtils.isNotEmpty(request.getZyzlState()) | |
| 1162 | + || StringUtils.isNotEmpty(request.getZywzzlState()) || StringUtils.isNotEmpty(request.getGyState())) { | |
| 1163 | + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); | |
| 1164 | + archiveQuery.setQueryNo(request.getQueryNo()); | |
| 1165 | + archiveQuery.setYn(YnEnums.YES.getId()); | |
| 1166 | + archiveQuery.setUsername(request.getUsername()); | |
| 1167 | + archiveQuery.setCertificateNum(request.getCardNo()); | |
| 1168 | + archiveQuery.setPhone(request.getPhone()); | |
| 1169 | + archiveQuery.setHospitalId(request.getHospitalId()); | |
| 1170 | + | |
| 1171 | + List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); | |
| 1172 | + parentIds = new ArrayList<>(); | |
| 1173 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
| 1174 | + for (ResidentsArchiveModel model : modelList) { | |
| 1175 | + parentIds.add(model.getId()); | |
| 1176 | + } | |
| 1177 | + } else { | |
| 1178 | + parentIds.add("-1"); | |
| 1179 | + } | |
| 1180 | + } | |
| 1156 | 1181 | PremaritalCheckupQuery query = new PremaritalCheckupQuery(); |
| 1157 | - query.setPage(request.getPage()); | |
| 1158 | - query.setLimit(request.getLimit()); | |
| 1159 | - query.setNeed("y"); | |
| 1160 | 1182 | query.setYn(YnEnums.YES.getId()); |
| 1183 | + query.setZyzlState(request.getZyzlState()); | |
| 1184 | + query.setZywzzlState(request.getZywzzlState()); | |
| 1185 | + query.setGyState(request.getGyState()); | |
| 1186 | + | |
| 1187 | + if (StringUtils.isNotEmpty(hospital)) { | |
| 1188 | + query.setHospitalId(hospital); | |
| 1189 | + } else { | |
| 1190 | + query.setHospitalId("-1"); | |
| 1191 | + } | |
| 1161 | 1192 | query.setYiXueYiJian(request.getYiXueYiJian()); |
| 1162 | 1193 | if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) { |
| 1163 | 1194 | String[] dates = request.getPremaritalUpTime().split(" - "); |
| ... | ... | @@ -1171,7 +1202,14 @@ |
| 1171 | 1202 | query.setPremaritalUpTimeEnd(date); |
| 1172 | 1203 | } |
| 1173 | 1204 | } |
| 1174 | - query.setHospitalId(hospital); | |
| 1205 | + query.setSexType(request.getSexType()); | |
| 1206 | + | |
| 1207 | + if (parentIds != null) { | |
| 1208 | + query.setParentIds(parentIds); | |
| 1209 | + } | |
| 1210 | + System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery()); | |
| 1211 | + | |
| 1212 | + | |
| 1175 | 1213 | List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query); |
| 1176 | 1214 | if (CollectionUtils.isNotEmpty(data)) { |
| 1177 | 1215 | lhxfyExport(out, list, data, response); |