From d54241d1cdb00efd083e56654816c8ac6076b134 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 7 Jul 2017 09:08:31 +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

---
 .../main/java/com/lyms/platform/query/AntExChuQuery.java   | 14 +++++++-------
 .../src/main/java/com/lyms/platform/query/AntExQuery.java  | 14 +++++++-------
 .../web/controller/AntexDoctorStatistController.java       |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
index c4df282..f38940d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
@@ -29,17 +29,17 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
     //大于修改时间
     private Date gteModified;
     private Date gteCreated;
-    private List<String> pids;
+    private List<String> parentIds;
     private String pid;
     private Date checkTimeStart;
     private Date checkTimeEnd;
 
-    public List<String> getPids() {
-        return pids;
+    public List<String> getParentIds() {
+        return parentIds;
     }
 
-    public void setPids(List<String> pids) {
-        this.pids = pids;
+    public void setParentIds(List<String> parentIds) {
+        this.parentIds = parentIds;
     }
 
     public Date getCheckTimeStart() {
@@ -171,8 +171,8 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != pid) {
             condition = condition.and("pid", pid, MongoOper.IS);
         }
-        if(CollectionUtils.isNotEmpty(pids)){
-            condition = condition.and("pid", pids, MongoOper.IN);
+        if(CollectionUtils.isNotEmpty(parentIds)){
+            condition = condition.and("parentId", parentIds, MongoOper.IN);
         }
         if(CollectionUtils.isNotEmpty(hospitalList)){
             condition = condition.and("hospitalId", hospitalList, MongoOper.IN);
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
index 786e456..59cfdc2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java
@@ -21,7 +21,7 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery {
     private Integer yn;
     private String id;
     private String pid;
-    private List<String> pids;
+    private List<String> parentIds;
     //创建时间
     private Date start;
 
@@ -36,12 +36,12 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private Date gteCreated;
 
-    public List<String> getPids() {
-        return pids;
+    public List<String> getParentIds() {
+        return parentIds;
     }
 
-    public void setPids(List<String> pids) {
-        this.pids = pids;
+    public void setParentIds(List<String> parentIds) {
+        this.parentIds = parentIds;
     }
 
     public Date getGteCreated() {
@@ -120,8 +120,8 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery {
         if(null!=pid){
             condition=  condition.and("pid",pid, MongoOper.IS);
         }
-        if(CollectionUtils.isNotEmpty(pids)){
-            condition = condition.and("pid", pids, MongoOper.IN);
+        if(CollectionUtils.isNotEmpty(parentIds)){
+            condition = condition.and("parentId", parentIds, MongoOper.IN);
         }
         if(null!=yn){
             condition= condition.and("yn",yn, MongoOper.IS);
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 3280773..ca9e2c7 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
@@ -91,14 +91,14 @@ public class AntexDoctorStatistController extends BaseController {
         //根据patientId集合查询产检表、产检复查表，获取医生id、patientId列表
         AntExChuQuery antExChuQuery = new AntExChuQuery();
         //患者集合
-        antExChuQuery.setPids(pIds);
+        antExChuQuery.setParentIds(pIds);
         antExChuQuery.setYn(1);
         antExChuQuery.setHospitalId(hospital);
         //初诊集合列表
         List<AntExChuModel> antExChuModels = antExService.queryAntExChu(antExChuQuery);
         AntExQuery antExQuery = new AntExQuery();
         antExQuery.setHospitalId(hospital);
-        antExQuery.setPids(pIds);
+        antExQuery.setParentIds(pIds);
         antExQuery.setYn(1);
         //复诊集合列表
         List<AntenatalExaminationModel> antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery());
@@ -217,7 +217,7 @@ public class AntexDoctorStatistController extends BaseController {
             doctorMap.put("data", doctorList);
             doctorInfo.add(doctorMap);
 
-            System.out.println(ar.toString());
+            // System.out.println(ar.toString());
         }
 
         DecimalFormat df = new DecimalFormat("0.0");//格式化小数，不足的补0
-- 
1.8.3.1