diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java index c43e73c..c2f85a2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java @@ -100,6 +100,18 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo //1 转入 0转出 private String action; + + // 申请医生编码 users.id + private String applyDoctor; + + public String getApplyDoctor() { + return applyDoctor; + } + + public void setApplyDoctor(String applyDoctor) { + this.applyDoctor = applyDoctor; + } + public String getAction() { return action; } @@ -417,6 +429,9 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo if (null != type) { condition = condition.and("type", type, MongoOper.IS); } + if (null != applyDoctor) { + condition = condition.and("applyDoctor", applyDoctor, MongoOper.IS); + } if (null != outHospitalId) { List list = new ArrayList<>(); list.add(outHospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index ba37cf0..538a630 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -385,6 +385,13 @@ public class ApplyScreeningFacade { referralApplyScreeningQuery.setAction(applyScreeningQueryRequest.getAction()); } + Users serviceUsers = usersService.getUsers(userId); + if(null != serviceUsers){ + // 不是主任的就按当前账号医生分 + if(serviceUsers.getZhiChenId() != 4){ + referralApplyScreeningQuery.setApplyDoctor(userId.toString()); + } + } referralApplyScreeningQuery.setOutDepartment(applyScreeningQueryRequest.getOutDepartment()); referralApplyScreeningQuery.setTransferredDepartment(applyScreeningQueryRequest.getTransferredDepartment()); List screeningModels =