From 73ab1d45748bf25cb9024a7471e2eb379c33cfcb Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 29 Sep 2021 11:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=86=E5=8C=96=E5=A9=9A?= =?UTF-8?q?=E6=A3=80=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/PremaritalCheckupFacade.java | 42 +--------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 4534536..356c04f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -1153,42 +1153,8 @@ public class PremaritalCheckupFacade { List> list = new ArrayList<>(); String hospital = autoMatchFacade.getHospitalId(userId); try { - - List parentIds = null; - - //用姓名和联系方式查询到的居民建档ID - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo()) - || StringUtils.isNotEmpty(request.getQueryNo()) || StringUtils.isNotEmpty(request.getZyzlState()) - || StringUtils.isNotEmpty(request.getZywzzlState()) || StringUtils.isNotEmpty(request.getGyState())) { - ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); - archiveQuery.setQueryNo(request.getQueryNo()); - archiveQuery.setYn(YnEnums.YES.getId()); - archiveQuery.setUsername(request.getUsername()); - archiveQuery.setCertificateNum(request.getCardNo()); - archiveQuery.setPhone(request.getPhone()); - archiveQuery.setHospitalId(request.getHospitalId()); - - List modelList = residentsArchiveService.queryResident(archiveQuery); - parentIds = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(modelList)) { - for (ResidentsArchiveModel model : modelList) { - parentIds.add(model.getId()); - } - } else { - parentIds.add("-1"); - } - } PremaritalCheckupQuery query = new PremaritalCheckupQuery(); query.setYn(YnEnums.YES.getId()); - query.setZyzlState(request.getZyzlState()); - query.setZywzzlState(request.getZywzzlState()); - query.setGyState(request.getGyState()); - - if (StringUtils.isNotEmpty(hospital)) { - query.setHospitalId(hospital); - } else { - query.setHospitalId("-1"); - } query.setYiXueYiJian(request.getYiXueYiJian()); if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) { String[] dates = request.getPremaritalUpTime().split(" - "); @@ -1202,14 +1168,8 @@ public class PremaritalCheckupFacade { query.setPremaritalUpTimeEnd(date); } } - query.setSexType(request.getSexType()); - - if (parentIds != null) { - query.setParentIds(parentIds); - } + query.setHospitalId(hospital); System.out.println("lhexport " + query.convertToQuery().convertToMongoQuery()); - - List data = premaritalCheckupService.queryPremaritalCheckup(query); if (CollectionUtils.isNotEmpty(data)) { lhxfyExport(out, list, data, response); -- 1.8.3.1