From a8710cb1b8a2e79cc3b41cfa9585bb130014aeb0 Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 25 Nov 2017 17:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java | 6 ++++-- .../lyms/platform/operate/web/controller/SyncDataController.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java index fe9c66a..216aeca 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java @@ -48,8 +48,10 @@ public class MatdeliverFollowModelDaoImpl extends BaseMongoDAOImpl queryByPidsGoup(List pids) { AggregationOperation match = Aggregation.match(Criteria.where("parentid").in(pids)); - AggregationOperation group = Aggregation.group("parentid").max("updateDate").as("updateDate"); - Aggregation aggregation = Aggregation.newAggregation(match, group); + AggregationOperation group = Aggregation.group("parentid", "hospitalId","deliveryDate","deliverId","contactResult","makeType","makeRemark","makeCreateUser","contactReason","visitResult","visitReason").max("updateDate").as("updateDate"); + AggregationOperation fields = Aggregation.project("_id", "parentid", "hospitalId","deliveryDate","deliverId","contactResult","makeType","makeRemark","makeCreateUser","contactReason","visitResult","visitReason"); + + Aggregation aggregation = Aggregation.newAggregation(match, group,fields); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_matdeliver_follow", MatdeliverFollowModel.class); return result.getMappedResults(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index 9e19f4e..3592724 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -15,6 +15,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.query.SyncDataQuery; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.ReflectionUtils; @@ -35,6 +36,8 @@ import java.util.List; @Controller public class SyncDataController extends BaseController { + private Logger log = Logger.getLogger(this.getClass()); + @Autowired private SyncDataService syncDataService; @@ -63,6 +66,7 @@ public class SyncDataController extends BaseController { SysBaseFacade sysBaseFacade = (SysBaseFacade) webApplicationContext.getBean(action); return sysBaseFacade.execute(synForm); } catch (Exception e) { + log.error("sysnDataSer异常",e); BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(e.getMessage()); baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); @@ -106,6 +110,7 @@ public class SyncDataController extends BaseController { } return baseResponse; } catch (Exception e) { + log.error("sysnReflectDataSer异常",e); e.printStackTrace(); baseResponse.setObject(e.getMessage()); baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); -- 1.8.3.1