From 88aac09841076a46b6fb82cec6b8780276bd008a Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 10 Jul 2017 10:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B7bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AntexDoctorStatistController.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java index be13a01..077d61c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java @@ -65,7 +65,7 @@ public class AntexDoctorStatistController extends BaseController { * @param endDate 建档结束时间 * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 * @param number 产检次数 点的是产检人数的话就传1, 2次（含）以上就传2, 5次（含）以上就传5 - * @param doctorId 医生ID + * @param doctorId 医生ID * @param currentPage 当前页 * @param pageSize 每页显示的数量 * @return @@ -285,25 +285,31 @@ public class AntexDoctorStatistController extends BaseController { adp.setCheckTime(aec.getCheckDate()); antextDoctorPatient.add(adp); } + + List resultData = new ArrayList<>(); + if(number!=null){ if(number == 2){ for(AntextDoctorPatient ad :antextDoctorPatient){ - if(ad.getCjNum()<2){ - antextDoctorPatient.remove(ad); + if(ad.getCjNum()>1){ + resultData.add(ad); } } }else if(number == 5){ for(AntextDoctorPatient ad :antextDoctorPatient){ - if(ad.getCjNum()<5){ - antextDoctorPatient.remove(ad); + if(ad.getCjNum()>4){ + resultData.add(ad); + } + } + }else{ + for(AntextDoctorPatient ad :antextDoctorPatient){ + if(ad.getCjNum()>4){ + resultData.add(ad); } } } } - - - - return antextDoctorPatient; + return resultData; } /** -- 1.8.3.1