Commit 4fc24125c563d06121049f3f3a68e97a0a2894b9
1 parent
0da1f223bf
Exists in
master
and in
1 other branch
产检节点统计
Showing 1 changed file with 13 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
4fc2412
| ... | ... | @@ -414,8 +414,10 @@ |
| 414 | 414 | |
| 415 | 415 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 416 | 416 | patientsQuery.setNeed("true"); |
| 417 | + patientsQuery.setPage(page); | |
| 418 | + patientsQuery.setLimit(limit); | |
| 417 | 419 | List<Map<String,Object>> list = getCheckPointList( time, hospitalId, |
| 418 | - provinceId, cityId, areaId, page, limit, userId,patientsQuery); | |
| 420 | + provinceId, cityId, areaId, userId,patientsQuery); | |
| 419 | 421 | |
| 420 | 422 | return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(patientsQuery.getPageInfo()); |
| 421 | 423 | } |
| ... | ... | @@ -424,7 +426,7 @@ |
| 424 | 426 | |
| 425 | 427 | private List getCheckPointList(String time, String hospitalId, |
| 426 | 428 | String provinceId, String cityId, |
| 427 | - String areaId, Integer page, Integer limit, | |
| 429 | + String areaId, | |
| 428 | 430 | Integer userId,PatientsQuery patientsQuery) |
| 429 | 431 | { |
| 430 | 432 | List<String> hospitalIds = new ArrayList<>(); |
| 431 | 433 | |
| ... | ... | @@ -462,9 +464,8 @@ |
| 462 | 464 | patientsQuery.setExtEnable(false); |
| 463 | 465 | |
| 464 | 466 | |
| 465 | - patientsQuery.setPage(page); | |
| 466 | - patientsQuery.setLimit(limit); | |
| 467 | 467 | |
| 468 | + | |
| 468 | 469 | List<Map<String,Object>> list = new ArrayList<>(); |
| 469 | 470 | //建档人数 |
| 470 | 471 | List<Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 471 | 472 | |
| ... | ... | @@ -524,9 +525,8 @@ |
| 524 | 525 | Integer userId, HttpServletResponse httpServletResponse) { |
| 525 | 526 | |
| 526 | 527 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 527 | - patientsQuery.setNeed("true"); | |
| 528 | 528 | List<Map<String,Object>> list = getCheckPointList( time, hospitalId, |
| 529 | - provinceId, cityId, areaId, null, null, userId,patientsQuery); | |
| 529 | + provinceId, cityId, areaId, userId,patientsQuery); | |
| 530 | 530 | |
| 531 | 531 | List<Map<String,Object>> results = new ArrayList<>(); |
| 532 | 532 | if (CollectionUtils.isNotEmpty(list)) |
| 533 | 533 | |
| ... | ... | @@ -578,9 +578,12 @@ |
| 578 | 578 | Integer page, Integer limit, Integer userId, Integer nodeName) |
| 579 | 579 | { |
| 580 | 580 | AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); |
| 581 | + antExRecordQuery.setPage(page); | |
| 582 | + antExRecordQuery.setLimit(limit); | |
| 583 | + antExRecordQuery.setNeed("true"); | |
| 581 | 584 | List<Map> results = getCheckDetailData( nodeType, time, hospitalId, |
| 582 | 585 | provinceId, cityId, areaId, |
| 583 | - page, limit, userId, nodeName, "true",antExRecordQuery); | |
| 586 | + userId, nodeName, antExRecordQuery); | |
| 584 | 587 | |
| 585 | 588 | return new BaseListResponse().setData(results).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(antExRecordQuery.getPageInfo()); |
| 586 | 589 | } |
| ... | ... | @@ -588,7 +591,7 @@ |
| 588 | 591 | |
| 589 | 592 | public List<Map> getCheckDetailData(Integer nodeType, String time, String hospitalId, |
| 590 | 593 | String provinceId, String cityId, String areaId, |
| 591 | - Integer page, Integer limit, Integer userId, Integer nodeName,String needPage, AntExRecordQuery antExRecordQuery) | |
| 594 | + Integer userId, Integer nodeName, AntExRecordQuery antExRecordQuery) | |
| 592 | 595 | { |
| 593 | 596 | |
| 594 | 597 | List<String> hospitalIds = new ArrayList<>(); |
| ... | ... | @@ -615,9 +618,7 @@ |
| 615 | 618 | antExRecordQuery.setBuildTimeStart(startTime); |
| 616 | 619 | antExRecordQuery.setBuildTimeEnd(endTime); |
| 617 | 620 | antExRecordQuery.setHospitalList(hospitalIds); |
| 618 | - antExRecordQuery.setPage(page); | |
| 619 | - antExRecordQuery.setLimit(limit); | |
| 620 | - antExRecordQuery.setNeed(needPage); | |
| 621 | + | |
| 621 | 622 | if (nodeType != null && nodeType == 1) |
| 622 | 623 | { |
| 623 | 624 | antExRecordQuery.setIsFirst(nodeType); |
| ... | ... | @@ -805,7 +806,7 @@ |
| 805 | 806 | AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); |
| 806 | 807 | List<Map> ticketList = getCheckDetailData( nodeType, time, hospitalId, |
| 807 | 808 | provinceId, cityId, areaId, |
| 808 | - null, null, userId, nodeName, null,antExRecordQuery); | |
| 809 | + userId, nodeName,antExRecordQuery); | |
| 809 | 810 | |
| 810 | 811 | List<Map<String,Object>> results = new ArrayList<>(); |
| 811 | 812 | if (CollectionUtils.isNotEmpty(ticketList)) |