Commit b046c310b31d0cab858622fe85f4fdd9e5c5b683
1 parent
c65db95b06
Exists in
dev
#fix:优化建档统计管理根据建档时间和预产期查询
Showing 1 changed file with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
b046c31
| ... | ... | @@ -1553,16 +1553,18 @@ |
| 1553 | 1553 | patientsQuery.setLimit(statisticsQueryRequest.getLimit()); |
| 1554 | 1554 | if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())){ |
| 1555 | 1555 | String time=statisticsQueryRequest.getDueDate(); |
| 1556 | - patientsQuery.setDueDateStart(DateUtil.parseYMDHMS(time+" 00:00:00")); | |
| 1557 | - patientsQuery.setDueDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59")); | |
| 1556 | + String array[]= time.split(" - "); | |
| 1557 | + patientsQuery.setDueDateStart(DateUtil.parseYMDHMS(array[0]+" 00:00:00")); | |
| 1558 | + patientsQuery.setDueDateEnd(DateUtil.parseYMDHMS(array[1]+" 23:59:59")); | |
| 1558 | 1559 | } |
| 1559 | 1560 | if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDoctor())){ |
| 1560 | 1561 | patientsQuery.setBookbuildingDoctor(statisticsQueryRequest.getBookbuildingDoctor()); |
| 1561 | 1562 | } |
| 1562 | 1563 | if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDate())){ |
| 1563 | - String time=statisticsQueryRequest.getDueDate(); | |
| 1564 | - patientsQuery.setBookbuildingDateStart(DateUtil.parseYMDHMS(time+" 00:00:00")); | |
| 1565 | - patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59")); | |
| 1564 | + String time=statisticsQueryRequest.getBookbuildingDate(); | |
| 1565 | + String array[]= time.split(" - "); | |
| 1566 | + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMDHMS(array[0]+" 00:00:00")); | |
| 1567 | + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMDHMS(array[1]+" 23:59:59")); | |
| 1566 | 1568 | } |
| 1567 | 1569 | List data = new ArrayList<>(); |
| 1568 | 1570 | if (statisticsQueryRequest.getType()==0){ |
| ... | ... | @@ -1771,5 +1773,6 @@ |
| 1771 | 1773 | |
| 1772 | 1774 | return baseResponse; |
| 1773 | 1775 | } |
| 1776 | + | |
| 1774 | 1777 | } |