From b2b601dbf4540ce609010ecc51e150716296dcb0 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 11 Jul 2017 15:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AntexDoctorStatistController.java   | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 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 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<String, List<String>> patientMap = new HashMap<>();
+        Map<String, Set<String>> patientMap = new HashMap<>();
         //获取患者集合
         List<Patients> patientsList = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+        patientId = new ArrayList<>();
         for (Patients ps : patientsList) {
-            if(patientMap.containsKey(ps.getPid())){//存在
-                List<String> paId = patientMap.get(ps.getPid());
-
-            }else{
-                List<String> paId = new ArrayList<>();
+            if (patientMap.containsKey(ps.getPid())) {//存在
+                patientMap.get(ps.getPid()).add(ps.getId());
+            } else {
+                Set<String> 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<String> 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())) {
-- 
1.8.3.1