diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 3133f0f..c33618e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -858,48 +858,50 @@ public class PatientFacade extends BaseServiceImpl { public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId, String need) { String hospital = autoMatchFacade.getHospitalId(userId); List maternalDeliverParentIds = null; - //查询号 - if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getQueryNo())) { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setType(3); - patientsQuery.setDueStatus(0); - patientsQuery.setSmsBuildTypeList(new ArrayList (Arrays.asList(0, 3))); - patientsQuery.setIsAutoFm(YnEnums.NO.getId()); - patientsQuery.setFmHospital(hospital); - patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); - patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo()); - List patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); - if (CollectionUtils.isNotEmpty(patientses)) { - maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, (List ) CollectionUtils.collect(patientses, new Transformer() { - @Override - public Object transform(Object o) { - Patients patients = (Patients) o; - return patients.getId(); - } - })); - - } - }//没有查询号条件和没有查询条件时 - else { - maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, null); - } List data = new ArrayList <>(); PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setPage(riskPatientsQueryRequest.getPage()); - patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); - System.out.println(maternalDeliverParentIds.size()); - if(CollectionUtils.isEmpty(maternalDeliverParentIds)){ - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); - } + try { + //查询号 + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getQueryNo())) { + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(3); + patientsQuery.setDueStatus(0); + patientsQuery.setSmsBuildTypeList(new ArrayList (Arrays.asList(0, 3))); + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); + patientsQuery.setFmHospital(hospital); + patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); + patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo()); + List patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); + if (CollectionUtils.isNotEmpty(patientses)) { + maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, (List ) CollectionUtils.collect(patientses, new Transformer() { + @Override + public Object transform(Object o) { + Patients patients = (Patients) o; + return patients.getId(); + } + })); + + } + }//没有查询号条件和没有查询条件时 + else { + maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, null); + } + patientsQuery = new PatientsQuery(); + patientsQuery.setPage(riskPatientsQueryRequest.getPage()); + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); + if(CollectionUtils.isEmpty(maternalDeliverParentIds)){ + return new BaseListResponse(); + } - //多线程 - patientsQuery.setIds(maternalDeliverParentIds); - List ps = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); - if (CollectionUtils.isNotEmpty(ps)) { - data = convertToHugeQuanWeight(ps); + //多线程 + patientsQuery.setIds(maternalDeliverParentIds); + List ps = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); + if (CollectionUtils.isNotEmpty(ps)) { + data = convertToHugeQuanWeight(ps); + } + } catch (Exception e) { + e.printStackTrace(); } - System.out.println(data.size()); return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); }