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 ebb6c3a..13e1048 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 @@ -187,11 +187,25 @@ public class AntexDoctorStatistController extends BaseController { //复诊集合列表 List antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); + //复诊:患者id + Map hostNum = new HashMap<>(); + //添加初诊结果 for (AntExChuModel ac : antExChuModels) { AntextDoctorPatient doctorPatient = resultInfo.get(ac.getParentId()); doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1); - + if(ac.getHospitalId().equals(hospital)){//如果医院id相同, + if(hostNum.containsKey(ac.getPid())){ + int num = hostNum.get(ac.getPid()); + num++; + if(num>doctorPatient.getCjNum()){ + doctorPatient.setCjNum(num); + } + hostNum.put(ac.getPid(),num); + }else{ + hostNum.put(ac.getPid(),1); + } + } if (ac.getCheckTime().after(doctorPatient.getCheckTime())) { doctorPatient.setCheckTime(ac.getCheckTime()); doctorPatient.setDoctorId(ac.getProdDoctor()); @@ -199,22 +213,21 @@ public class AntexDoctorStatistController extends BaseController { doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(doctorPatient.getCheckTime())); } - //复诊:本院id+医生Id - Map hostNum = new HashMap<>(); + //添加复诊结果 for (AntenatalExaminationModel aec : antenatalExaminationModels) { AntextDoctorPatient doctorPatient = resultInfo.get(aec.getParentId()); if(aec.getHospitalId().equals(hospital)){//如果医院id相同, - if(hostNum.containsKey(aec.getId())){//则当次数大于已经记录次数时进行加加,同一医院只有一次初检,所以初检不做处理 - int num = hostNum.get(aec.getId()); + if(hostNum.containsKey(aec.getPid())){ + int num = hostNum.get(aec.getPid()); num++; if(num>doctorPatient.getCjNum()){ doctorPatient.setCjNum(num); } - hostNum.put(aec.getId(),num); + hostNum.put(aec.getPid(),num); }else{ - hostNum.put(aec.getId(),1); + hostNum.put(aec.getPid(),1); } }