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 1bca54c..754eaeb 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 @@ -197,18 +197,19 @@ public class AntexDoctorStatistController extends BaseController { if (childBirth != null) { patientsQuery.setType(childBirth); } - Map> patientMap = new HashMap<>(); + Map> patientMap = new HashMap<>(); //获取患者集合 List patientsList = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + patientId = new ArrayList<>(); for (Patients ps : patientsList) { - if(patientMap.containsKey(ps.getPid())){//存在 - List paId = patientMap.get(ps.getPid()); - - }else{ - List paId = new ArrayList<>(); + if (patientMap.containsKey(ps.getPid())) {//存在 + patientMap.get(ps.getPid()).add(ps.getId()); + } else { + Set paId = new HashSet<>(); paId.add(ps.getId()); - patientMap.put(ps.getPid(),paId); + patientMap.put(ps.getPid(), paId); } + patientId.add(ps.getId()); } //根据当前登录人获取医院id @@ -232,7 +233,20 @@ public class AntexDoctorStatistController extends BaseController { //添加初诊结果 for (AntExChuModel ac : antExChuModels) { - AntextDoctorPatient doctorPatient = resultInfo.get(ac.getParentId()); + AntextDoctorPatient doctorPatient = null; + + if (!resultInfo.containsKey(ac.getParentId())) { + Set pSet = patientMap.get(ac.getPid()); + for (String pid : pSet) { + if (resultInfo.containsKey(pid)) { + doctorPatient = resultInfo.get(pid); + continue; + } + } + }else{ + doctorPatient = resultInfo.get(ac.getParentId()); + } + doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1); if (ac.getHospitalId().equals(hospital)) {//如果医院id相同, if (hostNum.containsKey(ac.getPid())) {