Commit 959887e2458d88438d95651d29508de835f9d101
1 parent
7638d642f1
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 40 additions and 38 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
959887e
| ... | ... | @@ -858,48 +858,50 @@ |
| 858 | 858 | public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId, String need) { |
| 859 | 859 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 860 | 860 | List <String> maternalDeliverParentIds = null; |
| 861 | - //查询号 | |
| 862 | - if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getQueryNo())) { | |
| 863 | - PatientsQuery patientsQuery = new PatientsQuery(); | |
| 864 | - patientsQuery.setYn(YnEnums.YES.getId()); | |
| 865 | - patientsQuery.setType(3); | |
| 866 | - patientsQuery.setDueStatus(0); | |
| 867 | - patientsQuery.setSmsBuildTypeList(new ArrayList <Integer>(Arrays.asList(0, 3))); | |
| 868 | - patientsQuery.setIsAutoFm(YnEnums.NO.getId()); | |
| 869 | - patientsQuery.setFmHospital(hospital); | |
| 870 | - patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); | |
| 871 | - patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo()); | |
| 872 | - List <Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 873 | - if (CollectionUtils.isNotEmpty(patientses)) { | |
| 874 | - maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, (List <String>) CollectionUtils.collect(patientses, new Transformer() { | |
| 875 | - @Override | |
| 876 | - public Object transform(Object o) { | |
| 877 | - Patients patients = (Patients) o; | |
| 878 | - return patients.getId(); | |
| 879 | - } | |
| 880 | - })); | |
| 881 | - | |
| 882 | - } | |
| 883 | - }//没有查询号条件和没有查询条件时 | |
| 884 | - else { | |
| 885 | - maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, null); | |
| 886 | - } | |
| 887 | 861 | List <Map> data = new ArrayList <>(); |
| 888 | 862 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 889 | - patientsQuery.setPage(riskPatientsQueryRequest.getPage()); | |
| 890 | - patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); | |
| 891 | - System.out.println(maternalDeliverParentIds.size()); | |
| 892 | - if(CollectionUtils.isEmpty(maternalDeliverParentIds)){ | |
| 893 | - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); | |
| 894 | - } | |
| 863 | + try { | |
| 864 | + //查询号 | |
| 865 | + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getQueryNo())) { | |
| 866 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
| 867 | + patientsQuery.setType(3); | |
| 868 | + patientsQuery.setDueStatus(0); | |
| 869 | + patientsQuery.setSmsBuildTypeList(new ArrayList <Integer>(Arrays.asList(0, 3))); | |
| 870 | + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); | |
| 871 | + patientsQuery.setFmHospital(hospital); | |
| 872 | + patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); | |
| 873 | + patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo()); | |
| 874 | + List <Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 875 | + if (CollectionUtils.isNotEmpty(patientses)) { | |
| 876 | + maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, (List <String>) CollectionUtils.collect(patientses, new Transformer() { | |
| 877 | + @Override | |
| 878 | + public Object transform(Object o) { | |
| 879 | + Patients patients = (Patients) o; | |
| 880 | + return patients.getId(); | |
| 881 | + } | |
| 882 | + })); | |
| 895 | 883 | |
| 896 | - //多线程 | |
| 897 | - patientsQuery.setIds(maternalDeliverParentIds); | |
| 898 | - List <Patients> ps = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 899 | - if (CollectionUtils.isNotEmpty(ps)) { | |
| 900 | - data = convertToHugeQuanWeight(ps); | |
| 884 | + } | |
| 885 | + }//没有查询号条件和没有查询条件时 | |
| 886 | + else { | |
| 887 | + maternalDeliverParentIds = getMaternalDeliverParentIds(riskPatientsQueryRequest, hospital, null); | |
| 888 | + } | |
| 889 | + patientsQuery = new PatientsQuery(); | |
| 890 | + patientsQuery.setPage(riskPatientsQueryRequest.getPage()); | |
| 891 | + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); | |
| 892 | + if(CollectionUtils.isEmpty(maternalDeliverParentIds)){ | |
| 893 | + return new BaseListResponse(); | |
| 894 | + } | |
| 895 | + | |
| 896 | + //多线程 | |
| 897 | + patientsQuery.setIds(maternalDeliverParentIds); | |
| 898 | + List <Patients> ps = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 899 | + if (CollectionUtils.isNotEmpty(ps)) { | |
| 900 | + data = convertToHugeQuanWeight(ps); | |
| 901 | + } | |
| 902 | + } catch (Exception e) { | |
| 903 | + e.printStackTrace(); | |
| 901 | 904 | } |
| 902 | - System.out.println(data.size()); | |
| 903 | 905 | return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); |
| 904 | 906 | } |
| 905 | 907 |