Commit 42a24920f3c6b487d0863c50f6830461e53f0e1e
1 parent
0a1b7a2c42
Exists in
dev
fix:优化儿童转诊列表相关逻辑
Showing 2 changed files with 27 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyDepartmentReferralQuery.java
View file @
42a2492
| ... | ... | @@ -56,7 +56,17 @@ |
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | private String sort; |
| 59 | + //1是病房 2是门诊 | |
| 60 | + private Integer type; | |
| 59 | 61 | |
| 62 | + | |
| 63 | + public Integer getType() { | |
| 64 | + return type; | |
| 65 | + } | |
| 66 | + | |
| 67 | + public void setType(Integer type) { | |
| 68 | + this.type = type; | |
| 69 | + } | |
| 60 | 70 | |
| 61 | 71 | public List <String> getZckss() { |
| 62 | 72 | return zckss; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java
View file @
42a2492
| ... | ... | @@ -318,15 +318,23 @@ |
| 318 | 318 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 319 | 319 | //1 转出 2 转入 |
| 320 | 320 | List list = new ArrayList(); |
| 321 | - list.add("erbao"); | |
| 322 | - list.add("yyzk"); | |
| 323 | - list.add("xlzk"); | |
| 324 | - list.add("fych"); | |
| 325 | - list.add("gwer"); | |
| 326 | - list.add("产科"); | |
| 327 | - list.add("新生儿病房"); | |
| 328 | - list.add("新生儿门诊"); | |
| 329 | - list.add("儿童保健科"); | |
| 321 | + if ("2100002419".equals(hospitalId)){ | |
| 322 | + list.add("erbao"); | |
| 323 | + list.add("yyzk"); | |
| 324 | + list.add("xlzk"); | |
| 325 | + list.add("fych"); | |
| 326 | + list.add("gwer"); | |
| 327 | + }else { | |
| 328 | + if (babyQuery.getType()==1){ | |
| 329 | + list.add("新生儿病房"); | |
| 330 | + }else if (babyQuery.getType()==2){ | |
| 331 | + list.add("产科"); | |
| 332 | + list.add("新生儿门诊"); | |
| 333 | + list.add("儿童保健科"); | |
| 334 | + } | |
| 335 | + } | |
| 336 | + | |
| 337 | + | |
| 330 | 338 | if("1".equals(babyQuery.getAction())){ |
| 331 | 339 | if(StringUtils.isEmpty(babyQuery.getZcks())){ |
| 332 | 340 | babyQuery.setZckss(list); |