diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java index a7a1786..5a03d10 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java @@ -191,6 +191,8 @@ public class MongoCondition { } else { criteria.all(obj); } + }else if(MongoOper.IN==oper){ + criteria.in(obj); } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java index ff0edad..fcdbaac 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java @@ -20,5 +20,6 @@ public enum MongoOper { NE, //模糊 LIKE, - ALL; + ALL, + IN; } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index c08ae56..630e156 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -7,7 +7,9 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/6/15 0015. @@ -186,17 +188,17 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=type){ condition=condition.and("type",type, MongoOper.IS); } - + if(null!=outHospitalId){ + condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); + } + List list = new ArrayList<>(); if(null!=transferredHospital){ + list.add(transferredHospital); if(null!=hospitalName){ - MongoCondition mongoCondition= MongoCondition.newInstance("hospitalName",hospitalName,MongoOper.IS); - MongoCondition mongoCondition1= MongoCondition.newInstance("transferredHospital",transferredHospital, MongoOper.IS); - condition=condition.andCondition(mongoCondition.orCondition(mongoCondition1)); + list.add(hospitalName); } - } - if(null!=outHospitalId){ - - condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); + MongoCondition mongoCondition1=MongoCondition.newInstance("transferredHospital", list, MongoOper.IN); + condition=condition.andCondition(mongoCondition1); } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index cc3665e..0059aa5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -337,6 +337,9 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); referralApplyOrderQuery.setType(applyOrderQueryRequest.getType()); + + String hospital=autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { List data = autoMatchFacade.matchOrgId(userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 3bb83a1..7e85830 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -322,6 +322,15 @@ public class MatDeliverFacade { list.add(baby3); list.add(baby4); */ System.out.print(buildBabyName(list));; + + + Date fmDate = DateUtil.parseYMD("2016-8-18"); + + + Date date= DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168); + System.out.print(DateUtil.getyyyy_MM_dd(date)); + System.out.print(fmDate.after(date)); + } /**