Commit 6fb9b4462ca15698abebbf240c1d38a3727445be
1 parent
204e101c19
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
6fb9b44
| ... | ... | @@ -668,7 +668,9 @@ |
| 668 | 668 | //滦平实现 下次预约时间升序方式，但是空默认在最前特两次查询组合在一起实现 |
| 669 | 669 | List <Patients> patientses = new ArrayList <>(); |
| 670 | 670 | if("lp".equals(riskPatientsQueryRequest.getHstart())){ |
| 671 | - if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){ | |
| 671 | + patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 672 | + | |
| 673 | + /* if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){ | |
| 672 | 674 | //下次检查时间非空，不用考虑空排序在前面问题 |
| 673 | 675 | patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); |
| 674 | 676 | }else { |
| ... | ... | @@ -683,7 +685,7 @@ |
| 683 | 685 | patientsQuery.setNextCheckTimeNe(false); |
| 684 | 686 | List <Patients> patientsesm = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); |
| 685 | 687 | patientses.addAll(patientsesm); |
| 686 | - } | |
| 688 | + }*/ | |
| 687 | 689 | |
| 688 | 690 | }else { |
| 689 | 691 | //以前逻辑 |
| ... | ... | @@ -695,6 +697,7 @@ |
| 695 | 697 | if (CollectionUtils.isNotEmpty(patientses)) { |
| 696 | 698 | //如果是查高危孕妇 |
| 697 | 699 | if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { |
| 700 | + data = convertToHighRisk(patientses, userId, hospital); | |
| 698 | 701 | data = convertToHighRisk(patientses, userId, hospital); |
| 699 | 702 | } else if (type == 1) { |
| 700 | 703 | //处理全部孕妇的情况 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
6fb9b44
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
View file @
6fb9b44