From 5984e41c89c4ac1dd3a484c555faf18088346b0c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 13 Jan 2017 11:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/impl/AntExRecordDaoImpl.java | 14 ++++++++------ .../platform/operate/web/facade/AntExRecordFacade.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExRecordDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExRecordDaoImpl.java index ece691d..5d5cea4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExRecordDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExRecordDaoImpl.java @@ -10,6 +10,9 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.MapReduceCommand; import com.mongodb.MapReduceOutput; +import org.springframework.data.mongodb.core.aggregation.Aggregation; +import org.springframework.data.mongodb.core.aggregation.AggregationOperation; +import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.stereotype.Repository; import java.util.ArrayList; @@ -37,17 +40,16 @@ public class AntExRecordDaoImpl extends BaseMongoDAOImpl imple * @return */ public List aggregateOne(MongoQuery mongoQuery){ - /*AggregationOperation match = Aggregation.match(*//*Criteria.where("hospitalId").is(hospitalId)*//*mongoQuery.getCriteria()); + AggregationOperation match = Aggregation.match(mongoQuery.getCriteria()); - String[] str= new String[]{"checkDoctor","pid"}; - AggregationOperation group = Aggregation.group(str).count().as("count"); + AggregationOperation group = Aggregation.group("checkDoctor").count().as("count"); Aggregation aggregation= Aggregation.newAggregation(match, group); AggregationResults result = mongoTemplate.aggregate(aggregation,"lyms_antexrecord", HashMap.class); - return result.getMappedResults();*/ - + return result.getMappedResults(); +/* String map = "function() {\n" + "\t\temit({checkDoctor:this.checkDoctor}, \n" + "\t\t{\"data\":[{\"pid\":this.pid}]});\n" + @@ -86,7 +88,7 @@ public class AntExRecordDaoImpl extends BaseMongoDAOImpl imple ids.add(map1); } } - return ids; + return ids;*/ } public void batchAddRecord(List list){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 3250757..d88edac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -406,7 +406,7 @@ public class AntExRecordFacade { for (HashMap map : list) { CjStatisticsResult cjStatisticsResult = new CjStatisticsResult(); String dId = null; - Object id = map.get("checkDoctor"); + Object id = map.get("_id"); if (null != id) { dId = id.toString(); } else { -- 1.8.3.1