Commit e746aef8752d27659c1abf139e85fa83acc02f89
1 parent
6fb9b4462c
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 2 additions and 27 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
e746aef
| ... | ... | @@ -665,39 +665,14 @@ |
| 665 | 665 | //查询符合条件的孕妇 |
| 666 | 666 | StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); |
| 667 | 667 | stopWatch.start(); |
| 668 | - //滦平实现 下次预约时间升序方式，但是空默认在最前特两次查询组合在一起实现 | |
| 669 | - List <Patients> patientses = new ArrayList <>(); | |
| 670 | - if("lp".equals(riskPatientsQueryRequest.getHstart())){ | |
| 671 | - patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 672 | - | |
| 673 | - /* if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){ | |
| 674 | - //下次检查时间非空，不用考虑空排序在前面问题 | |
| 675 | - patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 676 | - }else { | |
| 677 | - //下次检查时间空，先获取有检查数据 | |
| 678 | - patientsQuery.setNextCheckTimeNe(true); | |
| 679 | - List <Patients> patients1 = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 680 | - if(CollectionUtils.isNotEmpty(patients1)){ | |
| 681 | - patientses = patients1; | |
| 682 | - } | |
| 683 | - //在获取没有有检查数据 | |
| 684 | - patientsQuery.setNextCheckTimeIs(true); | |
| 685 | - patientsQuery.setNextCheckTimeNe(false); | |
| 686 | - List <Patients> patientsesm = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 687 | - patientses.addAll(patientsesm); | |
| 688 | - }*/ | |
| 689 | - | |
| 690 | - }else { | |
| 691 | - //以前逻辑 | |
| 692 | - patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 693 | - } | |
| 668 | + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 669 | + List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 694 | 670 | stopWatch.stop(); |
| 695 | 671 | logger.info(stopWatch.toString()); |
| 696 | 672 | List data = new ArrayList<QuanChanResult>(); |
| 697 | 673 | if (CollectionUtils.isNotEmpty(patientses)) { |
| 698 | 674 | //如果是查高危孕妇 |
| 699 | 675 | if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { |
| 700 | - data = convertToHighRisk(patientses, userId, hospital); | |
| 701 | 676 | data = convertToHighRisk(patientses, userId, hospital); |
| 702 | 677 | } else if (type == 1) { |
| 703 | 678 | //处理全部孕妇的情况 |