Commit 88aac09841076a46b6fb82cec6b8780276bd008a
1 parent
1afb35c048
Exists in
master
and in
6 other branches
查询号bug修改
Showing 1 changed file with 15 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java
View file @
88aac09
| ... | ... | @@ -65,7 +65,7 @@ |
| 65 | 65 | * @param endDate 建档结束时间 |
| 66 | 66 | * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 |
| 67 | 67 | * @param number 产检次数 点的是产检人数的话就传1, 2次（含）以上就传2, 5次（含）以上就传5 |
| 68 | - * @param doctorId 医生ID | |
| 68 | + * @param doctorId 医生ID | |
| 69 | 69 | * @param currentPage 当前页 |
| 70 | 70 | * @param pageSize 每页显示的数量 |
| 71 | 71 | * @return |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | |
| 75 | 75 | |
| ... | ... | @@ -285,25 +285,31 @@ |
| 285 | 285 | adp.setCheckTime(aec.getCheckDate()); |
| 286 | 286 | antextDoctorPatient.add(adp); |
| 287 | 287 | } |
| 288 | + | |
| 289 | + List<AntextDoctorPatient> resultData = new ArrayList<>(); | |
| 290 | + | |
| 288 | 291 | if(number!=null){ |
| 289 | 292 | if(number == 2){ |
| 290 | 293 | for(AntextDoctorPatient ad :antextDoctorPatient){ |
| 291 | - if(ad.getCjNum()<2){ | |
| 292 | - antextDoctorPatient.remove(ad); | |
| 294 | + if(ad.getCjNum()>1){ | |
| 295 | + resultData.add(ad); | |
| 293 | 296 | } |
| 294 | 297 | } |
| 295 | 298 | }else if(number == 5){ |
| 296 | 299 | for(AntextDoctorPatient ad :antextDoctorPatient){ |
| 297 | - if(ad.getCjNum()<5){ | |
| 298 | - antextDoctorPatient.remove(ad); | |
| 300 | + if(ad.getCjNum()>4){ | |
| 301 | + resultData.add(ad); | |
| 299 | 302 | } |
| 300 | 303 | } |
| 304 | + }else{ | |
| 305 | + for(AntextDoctorPatient ad :antextDoctorPatient){ | |
| 306 | + if(ad.getCjNum()>4){ | |
| 307 | + resultData.add(ad); | |
| 308 | + } | |
| 309 | + } | |
| 301 | 310 | } |
| 302 | 311 | } |
| 303 | - | |
| 304 | - | |
| 305 | - | |
| 306 | - return antextDoctorPatient; | |
| 312 | + return resultData; | |
| 307 | 313 | } |
| 308 | 314 | |
| 309 | 315 | /** |