diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyDepartmentReferralQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyDepartmentReferralQuery.java index 06b1146..ef0e779 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyDepartmentReferralQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyDepartmentReferralQuery.java @@ -56,8 +56,18 @@ public class BabyDepartmentReferralQuery extends BaseQuery implements IConvertTo private String sort; + //1是病房 2是门诊 + private Integer type; + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public List getZckss() { return zckss; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java index 7659e07..38a8ac1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java @@ -318,15 +318,23 @@ public class BabyDepartmentReferralFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); //1 转出 2 转入 List list = new ArrayList(); - list.add("erbao"); - list.add("yyzk"); - list.add("xlzk"); - list.add("fych"); - list.add("gwer"); - list.add("产科"); - list.add("新生儿病房"); - list.add("新生儿门诊"); - list.add("儿童保健科"); + if ("2100002419".equals(hospitalId)){ + list.add("erbao"); + list.add("yyzk"); + list.add("xlzk"); + list.add("fych"); + list.add("gwer"); + }else { + if (babyQuery.getType()==1){ + list.add("新生儿病房"); + }else if (babyQuery.getType()==2){ + list.add("产科"); + list.add("新生儿门诊"); + list.add("儿童保健科"); + } + } + + if("1".equals(babyQuery.getAction())){ if(StringUtils.isEmpty(babyQuery.getZcks())){ babyQuery.setZckss(list);