Commit 1ac078363f859562464d4d41c328f05dcab3c487
1 parent
980d3e1f25
Exists in
master
and in
6 other branches
区域围产儿统计
Showing 1 changed file with 17 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
1ac0783
| ... | ... | @@ -3256,7 +3256,7 @@ |
| 3256 | 3256 | public BaseResponse queryWcBabyReport(Integer userId, String time, Integer ageType, Integer lievType, String provinceId, String cityId) { |
| 3257 | 3257 | |
| 3258 | 3258 | //获取用户权限医院和筛选条件的交集 |
| 3259 | - List<String> currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions(userId, provinceId, | |
| 3259 | + List<String> currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions2(userId, provinceId, | |
| 3260 | 3260 | cityId, null); |
| 3261 | 3261 | |
| 3262 | 3262 | String[] dates = null; |
| 3263 | 3263 | |
| 3264 | 3264 | |
| 3265 | 3265 | |
| 3266 | 3266 | |
| 3267 | 3267 | |
| 3268 | 3268 | |
| 3269 | 3269 | |
| ... | ... | @@ -3511,28 +3511,36 @@ |
| 3511 | 3511 | case 1 : |
| 3512 | 3512 | patientsQuery.setFmAgeStart(0); |
| 3513 | 3513 | patientsQuery.setFmAgeEnd(19); |
| 3514 | + break; | |
| 3515 | + | |
| 3514 | 3516 | case 2 : |
| 3515 | 3517 | patientsQuery.setFmAgeStart(20); |
| 3516 | 3518 | patientsQuery.setFmAgeEnd(24); |
| 3519 | + break; | |
| 3517 | 3520 | case 3 : |
| 3518 | 3521 | patientsQuery.setFmAgeStart(25); |
| 3519 | 3522 | patientsQuery.setFmAgeEnd(29); |
| 3523 | + break; | |
| 3520 | 3524 | case 4 : |
| 3521 | 3525 | patientsQuery.setFmAgeStart(30); |
| 3522 | 3526 | patientsQuery.setFmAgeEnd(34); |
| 3527 | + break; | |
| 3523 | 3528 | case 5 : |
| 3524 | 3529 | patientsQuery.setFmAgeStart(35); |
| 3525 | 3530 | patientsQuery.setFmAgeEnd(100); |
| 3531 | + break; | |
| 3526 | 3532 | } |
| 3527 | 3533 | } |
| 3528 | - //lievType 1 城镇 2 农业 | |
| 3534 | + //lievType 1 城镇 2 农村 | |
| 3529 | 3535 | if (lievType != null) |
| 3530 | 3536 | { |
| 3531 | 3537 | switch (lievType) { |
| 3532 | 3538 | case 1: |
| 3533 | - patientsQuery.setPcensusTypeId("57624bf90cf23d4631523e9e"); | |
| 3539 | + patientsQuery.setPcensusTypeId(CZ); | |
| 3540 | + break; | |
| 3534 | 3541 | case 2: |
| 3535 | - patientsQuery.setPcensusTypeId("57624c090cf23d4631523e9f"); | |
| 3542 | + patientsQuery.setPcensusTypeId(NC); | |
| 3543 | + break; | |
| 3536 | 3544 | } |
| 3537 | 3545 | } |
| 3538 | 3546 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 3539 | 3547 | |
| 3540 | 3548 | |
| 3541 | 3549 | |
| 3542 | 3550 | |
| ... | ... | @@ -3694,18 +3702,23 @@ |
| 3694 | 3702 | case 1 : |
| 3695 | 3703 | fmAgeStart = 0; |
| 3696 | 3704 | fmAgeEnd = 19; |
| 3705 | + break; | |
| 3697 | 3706 | case 2 : |
| 3698 | 3707 | fmAgeStart = 20; |
| 3699 | 3708 | fmAgeEnd = 24; |
| 3709 | + break; | |
| 3700 | 3710 | case 3 : |
| 3701 | 3711 | fmAgeStart = 25; |
| 3702 | 3712 | fmAgeEnd = 29; |
| 3713 | + break; | |
| 3703 | 3714 | case 4 : |
| 3704 | 3715 | fmAgeStart = 30; |
| 3705 | 3716 | fmAgeEnd = 34; |
| 3717 | + break; | |
| 3706 | 3718 | case 5 : |
| 3707 | 3719 | fmAgeStart = 35; |
| 3708 | 3720 | fmAgeEnd = 100; |
| 3721 | + break; | |
| 3709 | 3722 | } |
| 3710 | 3723 | |
| 3711 | 3724 |