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 630e156..bf0ad66 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 @@ -189,10 +189,16 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati condition=condition.and("type",type, MongoOper.IS); } if(null!=outHospitalId){ - condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); + List list = new ArrayList<>(); + list.add(outHospitalId); + if(null!=hospitalName){ + list.add(hospitalName); + } + condition=condition.and("outHospitalId",outHospitalId, MongoOper.IN); } - List list = new ArrayList<>(); + if(null!=transferredHospital){ + List list = new ArrayList<>(); list.add(transferredHospital); if(null!=hospitalName){ list.add(hospitalName); 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 774bbbc..fe8f7d6 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 @@ -132,7 +132,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setType(type); referralApplyOrderModel.setOutHospitalId(hospital); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); - + referralApplyOrderModel.setId(null); referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital()); referralApplyOrderModel.setTransferredHospital(hospital);