diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index cc5d02b..b8f48b1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -47,6 +47,8 @@ public class ReferralApplyOrderModel { private String transferredHospital; //转出医院id private String outHospitalId; + //创建医院id + private String hospitalId; //体验会员 0非会员 1会员 private Integer expVip; //转入科室 @@ -72,6 +74,14 @@ public class ReferralApplyOrderModel { //转诊类型 1 儿童 2 孕妇 private Integer type; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getPid() { return pid; } 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 bf0ad66..6a3bfdd 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 @@ -50,11 +50,20 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //转入医院 private String transferredHospital; private String outHospitalId; + private String hospitalId; private String phone; private Integer type; //体验会员 0非会员 1会员 private Integer expVip; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getHospitalName() { return hospitalName; } @@ -168,6 +177,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=phone){ condition=condition.and("phone",phone, MongoOper.IS); } + if(null!=hospitalId){ + condition=condition.and("hospitalId",hospitalId, MongoOper.IS); + } //需要修改 if(null!=dueDateEnd){ 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 92edfcb..d3912b1 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 @@ -171,11 +171,13 @@ public class ApplyOrderFacade { } //孕妇 + referralApplyOrderModel.setHospitalId(hospital); referralApplyOrderModel.setType(type); referralApplyOrderModel.setOutHospitalId(hospital); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); referralApplyOrderModel.setId(null); + referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital()); referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital()); referralApplyOrderModel.setTransferredHospital(hospital); @@ -327,6 +329,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); String hospital = autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalId(hospital); referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { @@ -410,6 +413,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setType(applyOrderQueryRequest.getType()); String hospital = autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalId(hospital); referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) {