jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 73ab1d45748bf25cb9024a7471e2eb379c33cfcb

Authored by liquanyu
1 parent 00f773d34b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改隆化婚检导出

Showing 1 changed file with 1 additions and 41 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 73ab1d4
... ... @@ -1153,42 +1153,8 @@
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   - }
1181 1156 PremaritalCheckupQuery query = new PremaritalCheckupQuery();
1182 1157 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   - }
1192 1158 query.setYiXueYiJian(request.getYiXueYiJian());
1193 1159 if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) {
1194 1160 String[] dates = request.getPremaritalUpTime().split(" - ");
1195 1161  
... ... @@ -1202,14 +1168,8 @@
1202 1168 query.setPremaritalUpTimeEnd(date);
1203 1169 }
1204 1170 }
1205   - query.setSexType(request.getSexType());
1206   -
1207   - if (parentIds != null) {
1208   - query.setParentIds(parentIds);
1209   - }
  1171 + query.setHospitalId(hospital);
1210 1172 System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery());
1211   -
1212   -
1213 1173 List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
1214 1174 if (CollectionUtils.isNotEmpty(data)) {
1215 1175 lhxfyExport(out, list, data, response);